deleted linux config and make files

tworide · Feb 18, 2012 · 125e047 · 125e047
1 parent ea42a4b
commit 125e047
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 19 deletions.
diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/reza.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/reza.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/reza.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/reza.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/example-ofxUIButtons/src/main.cpp b/example-ofxUIButtons/src/main.cpp
@@ -6,7 +6,7 @@
 int main( ){
 
     ofAppGlutWindow window;
-	window.setGlutDisplayString("rgba double samples>=6 depth");        
+//	window.setGlutDisplayString("rgba double samples>=6 depth");        
 	ofSetupOpenGL(&window, 768,1024, OF_WINDOW);			// <-------- setup the GL context
 	ofRunApp( new testApp());
 }
diff --git a/example-ofxUICustomFont/src/main.cpp b/example-ofxUICustomFont/src/main.cpp
@@ -6,7 +6,7 @@
 int main( ){
 
     ofAppGlutWindow window;
-	window.setGlutDisplayString("rgba double samples>=6 depth");        
+//	window.setGlutDisplayString("rgba double samples>=6 depth");        
 	ofSetupOpenGL(&window, 768,1024, OF_WINDOW);			// <-------- setup the GL context
 	ofRunApp( new testApp());
 }
diff --git a/example-ofxUICustomPlacement/src/main.cpp b/example-ofxUICustomPlacement/src/main.cpp
@@ -6,7 +6,7 @@
 int main( ){
 
     ofAppGlutWindow window;
-	window.setGlutDisplayString("rgba double samples>=6 depth");        
+//	window.setGlutDisplayString("rgba double samples>=6 depth");        
 	ofSetupOpenGL(&window, 768,1024, OF_WINDOW);			// <-------- setup the GL context
 	ofRunApp( new testApp());
 }
diff --git a/example-ofxUICustomWidgets/src/main.cpp b/example-ofxUICustomWidgets/src/main.cpp
@@ -6,7 +6,7 @@
 int main( ){
 
     ofAppGlutWindow window;
-	window.setGlutDisplayString("rgba double samples>=6 depth");        
+//	window.setGlutDisplayString("rgba double samples>=6 depth");        
 	ofSetupOpenGL(&window, 768,1024, OF_WINDOW);			// <-------- setup the GL context
 	ofRunApp( new testApp());
 }
diff --git a/example-ofxUISimpleExample/src/main.cpp b/example-ofxUISimpleExample/src/main.cpp
@@ -6,7 +6,7 @@
 int main( ){
 
     ofAppGlutWindow window;
-	window.setGlutDisplayString("rgba double samples>=6 depth");        
+//	window.setGlutDisplayString("rgba double samples>=6 depth");        
 	ofSetupOpenGL(&window, 768,1024, OF_WINDOW);			// <-------- setup the GL context
 	ofRunApp( new testApp());
 }
diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/reza.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/reza.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/example-ofxUISliders/src/main.cpp b/example-ofxUISliders/src/main.cpp
@@ -6,7 +6,7 @@
 int main( ){
 
     ofAppGlutWindow window;
-	window.setGlutDisplayString("rgba double samples>=6 depth");        
+//	window.setGlutDisplayString("rgba double samples>=6 depth");        
 	ofSetupOpenGL(&window, 768,1024, OF_WINDOW);			// <-------- setup the GL context
 	ofRunApp( new testApp());
 }
diff --git a/example-ofxUITutorial/src/main.cpp b/example-ofxUITutorial/src/main.cpp
@@ -6,11 +6,8 @@
 int main( ){
 
     ofAppGlutWindow window;
-	ofSetupOpenGL(&window, 1024,768, OF_WINDOW);			// <-------- setup the GL context
-
-	// this kicks off the running of my app
-	// can be OF_WINDOW or OF_FULLSCREEN
-	// pass in width and height too:
+//	window.setGlutDisplayString("rgba double samples>=6 depth");        
+	ofSetupOpenGL(&window, 1024,768, OF_WINDOW);			// <-------- setup the GL context	
 	ofRunApp( new testApp());
 
 }
diff --git a/src/ofxUICanvas.h b/src/ofxUICanvas.h
@@ -954,7 +954,7 @@ class ofxUICanvas : public ofxUIWidget
 		widget->setRectParent(this->rect); 		
 		pushbackWidget(widget); 	
 	}
-		
+    
 	void addWidgetDown(ofxUIWidget *widget, ofxWidgetAlignment align = OFX_UI_ALIGN_LEFT)
 	{
 		addWidget(widget); 
@@ -1215,6 +1215,16 @@ class ofxUICanvas : public ofxUIWidget
 		return widgets_map[_name]; 
 	}
 
+    void removeWidget(string _name)    
+    {
+        //To Implement
+    }
+
+    void removeWidget(ofxUIWidget *widget)
+	{
+        //To Implement
+	}
+
 	void setDrawPadding(bool _draw_padded_rect)
 	{
 		draw_padded_rect = _draw_padded_rect; 

diff --git a/src/ofxUILabelButton.h b/src/ofxUILabelButton.h
@@ -103,12 +103,10 @@ class ofxUILabelButton : public ofxUIButton
         float w = labelrect->getWidth(); 
         float pw = rect->getWidth(); 
 
-		labelrect->y = ph*.5 - h*.5; 
-        labelrect->x = pw*.5 - w*.5-padding*.5; 
+		labelrect->y = (int)(ph*.5 - h*.5); 
+        labelrect->x = (int)(pw*.5 - w*.5-padding*.5); 
 		paddedRect->height = rect->height+padding*2.0;  
         paddedRect->width = rect->width+padding*2.0;  
-
-
 	}	
 
 

diff --git a/src/ofxUILabelToggle.h b/src/ofxUILabelToggle.h
@@ -67,7 +67,7 @@ class ofxUILabelToggle : public ofxUIToggle
         paddedRect = new ofxUIRectangle(-padding, -padding, padding*2.0, padding*2.0);
 		paddedRect->setParent(rect); 
 
-        label = new ofxUILabel(0,0,(name+" LABEL"), name, _size); 
+        label = new ofxUILabel((name+" LABEL"), name, _size); 
 		label->setParent(label); 
 		label->setRectParent(rect); 
 
@@ -155,8 +155,8 @@ class ofxUILabelToggle : public ofxUIToggle
         float w = labelrect->getWidth(); 
         float pw = rect->getWidth(); 
 
-		labelrect->y = ph*.5 - h*.5; 
-        labelrect->x = pw*.5 - w*.5-padding*.5; 
+		labelrect->y = (int)(ph*.5 - h*.5); 
+        labelrect->x = (int)(pw*.5 - w*.5-padding*.5); 
 		paddedRect->height = rect->height+padding*2.0;  
         paddedRect->width = rect->width+padding*2.0;  
 	}