Thread: [Saggui-svn] SF.net SVN: saggui: [453] trunk (Page 9)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 453
          http://saggui.svn.sourceforge.net/saggui/?rev=453&view=rev
Author:   juvinious
Date:     2007-07-28 12:42:23 -0700 (Sat, 28 Jul 2007)

Log Message:
-----------
Added deprecated macro. Deprecated button so that pushButton can be used instead. Fixed PALib compilation problems and updated to latest PALib.

Modified Paths:
--------------
    trunk/CHANGELOG
    trunk/examples/demo/src/allegro.cpp
    trunk/examples/demo/src/allegrogl.cpp
    trunk/examples/demo/src/openlayer.cpp
    trunk/examples/demo/src/sdl.cpp
    trunk/examples/demo/src/sdlgl.cpp
    trunk/examples/gamedemo/include/gamedemo.h
    trunk/examples/gamedemo/src/gamedemo.cpp
    trunk/examples/widgets/include/widgets.h
    trunk/examples/widgets/src/widgets.cpp
    trunk/include/saggui/dllspec.h
    trunk/include/saggui/widgets/button.h
    trunk/include/saggui/widgets/listbox.h
    trunk/include/saggui/widgets/scroll_bar.h
    trunk/modules/palib/include/saggui/pa_gfx.h
    trunk/modules/palib/include/saggui/pa_mouse.h
    trunk/modules/palib/include/saggui/saggui.h
    trunk/modules/palib/saggui/pa_gfx.cpp
    trunk/modules/palib/saggui/pa_keyinput.cpp
    trunk/modules/palib/saggui/pa_mouse.cpp
    trunk/modules/palib/source/main.cpp
    trunk/src/widgets/listbox.cpp
    trunk/src/widgets/scroll_bar.cpp

Modified: trunk/CHANGELOG
===================================================================

--- trunk/CHANGELOG	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/CHANGELOG	2007-07-28 19:42:23 UTC (rev 453)
@@ -1,4 +1,8 @@
-0.46
+0.48
+- Fixed compilation issues with PALib, updated to the most recent version of PALib as of 07/28/07
+- Moved all dependent widgets and examples from button to pushButton
+- Deprecated button so that pushButton can be used in its place
+- Added deprecated macro to dllspec to facilitate deprecation
 - Implemented a new push button which will eventually replace the current button implementation
 - Made additional fixes for abstractButton
 

Modified: trunk/examples/demo/src/allegro.cpp
===================================================================
--- trunk/examples/demo/src/allegro.cpp	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/examples/demo/src/allegro.cpp	2007-07-28 19:42:23 UTC (rev 453)
@@ -183,7 +183,7 @@
 	//tBox.setWordWrap(false);
 	
 	// Button tester
-	button myButton;
+	pushButton myButton;
 	myButton.setText("Press me!");
 	myButton.position.setPosition(400,400);
 	

Modified: trunk/examples/demo/src/allegrogl.cpp
===================================================================
--- trunk/examples/demo/src/allegrogl.cpp	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/examples/demo/src/allegrogl.cpp	2007-07-28 19:42:23 UTC (rev 453)
@@ -180,7 +180,7 @@
 	//tBox.setWordWrap(false);
 	
 	// Button tester
-	button myButton;
+	pushButton myButton;
 	myButton.setText("Press me!");
 	myButton.position.setPosition(400,400);
 	

Modified: trunk/examples/demo/src/openlayer.cpp
===================================================================
--- trunk/examples/demo/src/openlayer.cpp	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/examples/demo/src/openlayer.cpp	2007-07-28 19:42:23 UTC (rev 453)
@@ -180,7 +180,7 @@
 	//tBox.setWordWrap(false);
 	
 	// Button tester
-	button myButton;
+	pushButton myButton;
 	myButton.setText("Press me!");
 	myButton.position.setPosition(400,400);
 	

Modified: trunk/examples/demo/src/sdl.cpp
===================================================================
--- trunk/examples/demo/src/sdl.cpp	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/examples/demo/src/sdl.cpp	2007-07-28 19:42:23 UTC (rev 453)
@@ -179,7 +179,7 @@
 	//tBox.setWordWrap(false);
 	
 	// Button tester
-	button myButton;
+	pushButton myButton;
 	myButton.setText("Press me!");
 	myButton.position.setPosition(400,400);
 	

Modified: trunk/examples/demo/src/sdlgl.cpp
===================================================================
--- trunk/examples/demo/src/sdlgl.cpp	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/examples/demo/src/sdlgl.cpp	2007-07-28 19:42:23 UTC (rev 453)
@@ -248,7 +248,7 @@
 	//tBox.setWordWrap(false);
 	
 	// Button tester
-	button myButton;
+	pushButton myButton;
 	myButton.setText("Press me!");
 	myButton.position.setPosition(400,400);
 	

Modified: trunk/examples/gamedemo/include/gamedemo.h
===================================================================
--- trunk/examples/gamedemo/include/gamedemo.h	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/examples/gamedemo/include/gamedemo.h	2007-07-28 19:42:23 UTC (rev 453)
@@ -85,8 +85,8 @@
 		void toggleScreen2(const coord &c);
 		
 		box menu;
-		button opt1;
-		button opt2;
+		pushButton opt1;
+		pushButton opt2;
 		checkBox check1;
 		label checkLabel;
 };
@@ -143,7 +143,7 @@
 	public:
 		icon(window *parent, graphic *bmp, double x, double y, double width=32, double height=32);
 		~icon();
-		button b1;
+		pushButton b1;
 		label text;
 		blankDecor dec;
 };

Modified: trunk/examples/gamedemo/src/gamedemo.cpp
===================================================================
--- trunk/examples/gamedemo/src/gamedemo.cpp	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/examples/gamedemo/src/gamedemo.cpp	2007-07-28 19:42:23 UTC (rev 453)
@@ -307,7 +307,7 @@
 icon::icon(window *parent, graphic *bmp, double x, double y, double width, double height)
 {
 	parent->addChild(&b1);
-	b1.setBitmap(bmp);
+	b1.setIcon(bmp);
 	b1.position.set(x,y,width,height);
 	b1.onHover.connect(this,&icon::showText);
 	b1.onHoverOut.connect(this,&icon::hideText);

Modified: trunk/examples/widgets/include/widgets.h
===================================================================
--- trunk/examples/widgets/include/widgets.h	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/examples/widgets/include/widgets.h	2007-07-28 19:42:23 UTC (rev 453)
@@ -67,9 +67,7 @@
 		
 		void onEnter(const keys &k);
 		
-		void onButton1();
-		
-		void onButton2(const coord &pos);
+		void onButton1(const coord &pos);
 };
 
 #endif /* WIDGETS_H */

Modified: trunk/examples/widgets/src/widgets.cpp
===================================================================
--- trunk/examples/widgets/src/widgets.cpp	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/examples/widgets/src/widgets.cpp	2007-07-28 19:42:23 UTC (rev 453)
@@ -138,10 +138,8 @@
 
 static inputBox *input1 = 0;
 
-static button *pushButton1 = 0;
+static pushButton *pushButton1 = 0;
 
-static pushButton *pushButton2 = 0;
-
 static textBox *textArea = 0;
 
 static listBox *lb = 0;
@@ -201,17 +199,11 @@
 	input1->setHorizontalAlign(inputBox::T_Left);
 	input1->setText("Input text");
 	
-	pushButton1 = new button();
+	pushButton1 = new pushButton();
 	pushButton1->position.setPosition(140,220);
 	pushButton1->setText("Clear text!");
-	pushButton1->onButtonClick.connect(container,&widgetContainer::onButton1);
+	pushButton1->clicked.connect(container,&widgetContainer::onButton1);
 	
-	pushButton2 = new pushButton();
-	pushButton2->position.setPosition(240,220);
-	//pushButton2->setIcon(logo);
-	pushButton2->setText("Clear text!");
-	pushButton2->clicked.connect(container,&widgetContainer::onButton2);
-	
 	cb1 = new checkBox();
 	cb1->position.set(10,340,resourceManager::getFont()->getWidth()+4,resourceManager::getFont()->getWidth()+4);
 	cb1->onEnable.connect(container,&widgetContainer::fullscreen);
@@ -241,7 +233,6 @@
 	mainBox->addChild(text2);
 	mainBox->addChild(input1);
 	mainBox->addChild(pushButton1);
-	mainBox->addChild(pushButton2);
 	mainBox->addChild(cb1);
 	mainBox->addChild(text3);
 	mainBox->addChild(lb);
@@ -264,7 +255,6 @@
 	delete text2;
 	delete input1;
 	delete pushButton1;
-	delete pushButton2;
 	
 	delete cb1;
 	delete text3;
@@ -312,15 +302,10 @@
 	}
 }
 
-void widgetContainer::onButton1()
+void widgetContainer::onButton1(const coord &pos)
 {
 	textArea->clearText();
 }
 
-void widgetContainer::onButton2(const coord &pos)
-{
-	textArea->clearText();
-}
-
 #endif /* WIDGETS_CPP */
 

Modified: trunk/include/saggui/dllspec.h
===================================================================
--- trunk/include/saggui/dllspec.h	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/include/saggui/dllspec.h	2007-07-28 19:42:23 UTC (rev 453)
@@ -42,12 +42,15 @@
 #if defined (_WIN32) && defined (SAGGUI_LIB_BUILD) && defined (SAGGUI_SHARED)
 #define SAGGUI_EXPORT __declspec(dllexport)
 #define SAGGUI_EXT_EXPORT __declspec(dllexport)
+#define SAGGUI_EXPORT_METHOD dllexport
 #elif defined (_WIN32) && defined (SAGGUI_SHARED)
 #define SAGGUI_EXPORT __declspec(dllimport)
 #define SAGGUI_EXT_EXPORT __declspec(dllimport)
+#define SAGGUI_EXPORT_METHOD dllexport
 #else
 #define SAGGUI_EXPORT
 #define SAGGUI_EXT_EXPORT
+#define SAGGUI_EXPORT_METHOD
 #endif
 
 #ifdef _MSC_VER
@@ -56,4 +59,11 @@
 #endif
 #endif
 
+#ifdef __GNUC__
+//#define SAGGUI_DEPRECATED __attribute__((deprecated, SAGGUI_EXPORT_METHOD))
+#define SAGGUI_DEPRECATED __attribute__ ((deprecated))
+#else
+#define SAGGUI_DEPRECATED
 #endif
+
+#endif

Modified: trunk/include/saggui/widgets/button.h
===================================================================
--- trunk/include/saggui/widgets/button.h	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/include/saggui/widgets/button.h	2007-07-28 19:42:23 UTC (rev 453)
@@ -54,6 +54,9 @@
 	 * It can just be used to show off your clicks, make your interfaces neater. \n
 	 * Just connect events to it, slap a graphic on it and/or add some text.\n
 	 * It will autoresize if the text is larger than the width and height of the widget. \n
+	 * 
+	 * 
+	 * \note This function has been deprecated please take a look at pushButton 
     	*/
 
 	class SAGGUI_EXPORT button : public window, public mouseEvents, public keyEvents
@@ -96,7 +99,7 @@
 			void setClickSystem(mouseButtons type);
 		public:
 			//! Constructor
-			button();
+			SAGGUI_DEPRECATED button();
 			
 			//! Destructor
 			~button();

Modified: trunk/include/saggui/widgets/listbox.h
===================================================================
--- trunk/include/saggui/widgets/listbox.h	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/include/saggui/widgets/listbox.h	2007-07-28 19:42:23 UTC (rev 453)
@@ -42,7 +42,7 @@
 #include "saggui/window.h"
 #include "saggui/mouse_events.h"
 #include "saggui/key_events.h"
-#include "saggui/widgets/button.h"
+#include "saggui/widgets/pushbutton.h"
 #include "saggui/widgets/label.h"
 #include "saggui/widgets/scroll_bar.h"
 
@@ -75,11 +75,11 @@
 			slot resized();
 		
 			slot drawOnButton(const coord &pos, graphic *bmp, const std::vector<rgba> &colors, const uint32_t &flags, const shapeType &shape);
-		
+			
 			slot showPopUp();
 			
-			slot showPopUp(const coord &c);
-		
+			slot showPopUp(const coord &pos);
+			
 			slot hidePopUp();
 			
 			slot onHoverItem(const coord &pos);
@@ -111,7 +111,7 @@
 			//! Label to contain our chosen item
 			label chosen;
 			//! Button for drop down
-			button showListButton;
+			pushButton showListButton;
 		
 			//! Popup for selectable list
 			box popUp;

Modified: trunk/include/saggui/widgets/scroll_bar.h
===================================================================
--- trunk/include/saggui/widgets/scroll_bar.h	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/include/saggui/widgets/scroll_bar.h	2007-07-28 19:42:23 UTC (rev 453)
@@ -46,7 +46,7 @@
 #include "saggui/key_events.h"
 #include "saggui/timer.h"
 #include "saggui/widgets/box.h"
-#include "saggui/widgets/button.h"
+#include "saggui/widgets/pushbutton.h"
 
 namespace saggui
 {
@@ -86,10 +86,10 @@
 			double buttonSize;
 			
 			//! The topmost button (Top horizontal | left vertical)
-			button topButton;
+			pushButton topButton;
 			
 			//! The bottommost button (bottom horizontal | right vertical)
-			button bottomButton;
+			pushButton bottomButton;
 			
 			//! The centered button (crawls the index)
 			box middleButton;
@@ -151,10 +151,10 @@
 			virtual void onUp(const coord &c);
 			virtual void scrollWheelUp(const coord &c);
 			virtual void scrollWheelDown(const coord &c);
-			virtual void topButtonDown();
-			virtual void topButtonUp();
-			virtual void bottomButtonDown();
-			virtual void bottomButtonUp();
+			virtual slot topButtonDown(const coord &pos);
+			virtual slot topButtonUp(const coord &pos);
+			virtual slot bottomButtonDown(const coord &pos);
+			virtual slot bottomButtonUp(const coord &pos);
 			virtual void middleButtonMove();
 			virtual void middleButtonUp(const coord &c);
 			virtual void resizeButtons();

Modified: trunk/modules/palib/include/saggui/pa_gfx.h
===================================================================
--- trunk/modules/palib/include/saggui/pa_gfx.h	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/modules/palib/include/saggui/pa_gfx.h	2007-07-28 19:42:23 UTC (rev 453)
@@ -91,6 +91,11 @@
 				
 			//! Draw Filled Circle to bitmap or passed bitmap
 			void doCirclefill(double x, double y, double radius,const rgba & color, graphic *bmp=0);
+			
+			//! Draw a filled triangle between three points to bitmap or passed bitmap
+			void doTriangle(double x1, double y1, double x2, double y2, double x3, double y3, const rgba & color, graphic *bmp=0);
+	
+			
 		
 				
 			// Bitmap Routines
@@ -121,15 +126,9 @@
 			
 			//! Clear to color
 			void clearBmp(const rgba & color);
-				
-			//! Blit bitmap
-			void renderBmp(double x,double y,const rgba & color=rgba::NOCOLOR, graphic *b=0);
-				
-			//! Stretch Blit bitmap
-			void renderStretchedBmp(double x, double y, double width, double height,const rgba & color=rgba::NOCOLOR,graphic *b=0);
 			
-			//! Render a portion of the bitmap to the given bitmap
-			void renderBmpArea(double x1, double y1, double x2, double y2, double width, double height, graphic *b);
+			//! Render a certain area of a bitmap
+			void renderBmp(double x1, double y1, double x2, double y2, double width, double height, const rgba &color, graphic *b=0);
 	};
 }
 

Modified: trunk/modules/palib/include/saggui/pa_mouse.h
===================================================================
--- trunk/modules/palib/include/saggui/pa_mouse.h	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/modules/palib/include/saggui/pa_mouse.h	2007-07-28 19:42:23 UTC (rev 453)
@@ -65,6 +65,8 @@
 		~paMouse();
 		//! Updates the mouse ie polling and setting keys
 		void update();
+		//! Sets the mouse pointer to specific location
+		void setPosition(int x, int y);
     };
 }
 

Modified: trunk/modules/palib/include/saggui/saggui.h
===================================================================
--- trunk/modules/palib/include/saggui/saggui.h	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/modules/palib/include/saggui/saggui.h	2007-07-28 19:42:23 UTC (rev 453)
@@ -52,9 +52,10 @@
 //! These are the base GUI headers
 #include "saggui/animation.h"
 #include "saggui/bitmap_font.h"
+#include "saggui/common.h"
 #include "saggui/coord.h"
 #include "saggui/debug.h"
-#include "saggui/decorator.h"
+#include "saggui/style.h"
 #include "saggui/dllspec.h"
 #include "saggui/font.h"
 #include "saggui/font_base.h"
@@ -72,27 +73,33 @@
 #include "saggui/mouse_manager.h"
 #include "saggui/resource_manager.h"
 #include "saggui/rgba.h"
+#include "saggui/scheme.h"
 #include "saggui/sigslot.h"
 #include "saggui/sprite.h"
 #include "saggui/system_factory.h"
-/* #include "saggui/system_graphics.h" */
 #include "saggui/system.h"
 #include "saggui/timer.h"
 #include "saggui/window.h"
 
-
 //! Headers for included widgets
+#include "saggui/widgets/abstractbutton.h"
 #include "saggui/widgets/box.h"
 #include "saggui/widgets/button.h"
+#include "saggui/widgets/buttongroup.h"
 #include "saggui/widgets/checkbox.h"
 #include "saggui/widgets/dialog.h"
 #include "saggui/widgets/input_box.h"
 #include "saggui/widgets/label.h"
+#include "saggui/widgets/listbox.h"
 #include "saggui/widgets/progress_bar.h"
+#include "saggui/widgets/pushbutton.h"
 #include "saggui/widgets/radial.h"
 #include "saggui/widgets/scroll_bar.h"
 #include "saggui/widgets/text_box.h"
 
+//! Headers for included schemes
+#include "saggui/schemes/defaultscheme.h"
+
 //! Headers for module
 #include "pa_factory.h"
 #include "pa_font.h"

Modified: trunk/modules/palib/saggui/pa_gfx.cpp
===================================================================
--- trunk/modules/palib/saggui/pa_gfx.cpp	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/modules/palib/saggui/pa_gfx.cpp	2007-07-28 19:42:23 UTC (rev 453)
@@ -46,13 +46,13 @@
 {
 	static void fixX(double &x)
 	{
-		if(x<0)x=0;
-		if(x>255)x=255;
+		if(x<=1)x=1;
+		if(x>=254)x=254;
 	}
 	static void fixY(double &y)
 	{
-		if(y<0)y=0;
-		if(y>191)y=191;
+		if(y<=1)y=1;
+		if(y>=190)y=190;
 	}
 	
 	
@@ -110,8 +110,8 @@
 		//!FIXME
 		fixX(x);
 		fixY(y);
-		if((x+width) > 255)width = 255 - x;
-		if((y+height) > 191)height = 191 - y;
+		width = ((x + width) > 254) ? 254 - x : width;
+		height = ((y + height) > 190) ? 190 - y : height;
 		PA_Draw16bitLine (0, u16(x), u16(y), u16(x + width), u16(y), PA_RGB((u16)color.red >> 3,(u16)color.green >> 3,(u16)color.red >> 3));
 		PA_Draw16bitLine (0, u16(x), u16(y), u16(x), u16(y + height), PA_RGB((u16)color.red >> 3,(u16)color.green >> 3,(u16)color.red >> 3));
 		PA_Draw16bitLine (0, u16(x + width), u16(y), u16(x + width), u16(y + height), PA_RGB((u16)color.red >> 3,(u16)color.green >> 3,(u16)color.red >> 3));
@@ -125,8 +125,8 @@
 		//!FIXME
 		fixX(x);
 		fixY(y);
-		if((x+width) > 255)width = 255 - x;
-		if((y+height) > 191)height = 191 - y;
+		width = ((x + width) > 254) ? 254 - x : width;
+		height = ((y + height) > 190) ? 190 - y : height;
 		PA_Draw16bitRect (0, s16(x), s16(y), s16(x+width), s16(y+height), PA_RGB((u16)color.red >> 3,(u16)color.green >> 3,(u16)color.red >> 3));
 	}
 	
@@ -142,6 +142,11 @@
 	{
 		//!FIXME
 	}
+
+	void paGraphic::doTriangle(double x1, double y1, double x2, double y2, double x3, double y3, const rgba & color, graphic *bmp)
+	{
+		//!FIXME
+	}
 	
 	 //! Load bitmap from file (and save filename)
 	void paGraphic::loadBmp(const std::string & filename, const rgba & color)
@@ -197,24 +202,11 @@
 		if(isScreenBmp())PA_Clear16bitBg(0);
 	}
 	
-	//! Blit
-	void paGraphic::renderBmp(double x,double y,const rgba & color, graphic *b)
+	//! render bmp
+	void paGraphic::renderBmp(double x1, double y1, double x2, double y2, double width, double height, const rgba &color, graphic *b)
 	{
 		//!FIXME
-		//PA_8bitDraw(0,0);
 	}
-	//! Stretch Blit
-	void paGraphic::renderStretchedBmp(double x, double y, double width, double height,const rgba & color,graphic *b)
-	{
-		//!FIXME
-		//PA_8bitDraw(0,0);
-	}
-	
-	
-	void paGraphic::renderBmpArea(double x1, double y1, double x2, double y2, double width, double height, graphic *b)
-	{
-		//!FIXME
-	}
 }
 
 #endif

Modified: trunk/modules/palib/saggui/pa_keyinput.cpp
===================================================================
--- trunk/modules/palib/saggui/pa_keyinput.cpp	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/modules/palib/saggui/pa_keyinput.cpp	2007-07-28 19:42:23 UTC (rev 453)
@@ -58,6 +58,8 @@
 	keys paKeyInput::convertKey(int unicode, int scancode)
 	{
 		//!FIXME
+		
+		return keys();
 	}
 	
 	//init

Modified: trunk/modules/palib/saggui/pa_mouse.cpp
===================================================================
--- trunk/modules/palib/saggui/pa_mouse.cpp	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/modules/palib/saggui/pa_mouse.cpp	2007-07-28 19:42:23 UTC (rev 453)
@@ -68,6 +68,14 @@
 		else
 			buttonState[LEFTBUTTON] = false;
 	}
+	
+
+	//! Sets the mouse pointer to specific location
+	void paMouse::setPosition(int x, int y)
+	{
+		Stylus.X = x;
+		Stylus.Y = y;
+	}
 }
 
 #endif

Modified: trunk/modules/palib/source/main.cpp
===================================================================
--- trunk/modules/palib/source/main.cpp	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/modules/palib/source/main.cpp	2007-07-28 19:42:23 UTC (rev 453)
@@ -10,10 +10,10 @@
 	public:
 	line()
 	{
-		x1 = PA_RandMinMax(0,255);
-		x2 = PA_RandMinMax(0,255);
-		y1 = PA_RandMinMax(0,191);
-		y2 = PA_RandMinMax(0,191);
+		x1 = PA_RandMinMax(0,254);
+		x2 = PA_RandMinMax(0,254);
+		y1 = PA_RandMinMax(0,190);
+		y2 = PA_RandMinMax(0,190);
 		if(PA_RandMinMax(0,100)<50)x1dir = -1;
 		else x1dir = 1;
 		if(PA_RandMinMax(0,100)<50)x2dir = -1;
@@ -34,9 +34,9 @@
 			x1=0;
 			x1dir=1;
 		}
-		if(x1>=255)
+		if(x1>=254)
 		{
-			x1=255;
+			x1=254;
 			x1dir=-1;
 		}
 		if(x2<=0)
@@ -44,10 +44,10 @@
 			x2dir=1;
 			x2=0;
 		}
-		if(x2>=255)
+		if(x2>=254)
 		{
 			x2dir=-1;
-			x2=255;
+			x2=254;
 		}
 		if(y1<=0)
 		{
@@ -57,17 +57,17 @@
 		if(y1>=191)
 		{
 			y1dir=-1;
-			y1=191;
+			y1=190;
 		}
 		if(y2<=0)
 		{
 			y2dir=1;
 			y2=0;
 		}
-		if(y2>=191)
+		if(y2>=190)
 		{
 			y2dir=-1;
-			y2=191;
+			y2=190;
 		}
 		x1+=x1dir;
 		y1+=y1dir;
@@ -110,7 +110,7 @@
 		int duration;
 };
 
-class touch : public sigslot::has_slots<>
+class touch : public has_slots<>
 {
 	public:
 		touch()
@@ -119,13 +119,13 @@
 		~touch()
 		{
 		}
-		void info(coord c)
+		void info(const coord &c)
 		{
 			PA_OutputText(1,0,4,"x: %03d | y: %03d", s16(c.x), s16(c.y));
 			PA_OutputText(1,0,8,"Focused widget: %03d", s16(guiManager::getMouseOverWinIDWM()));
 		}
 		
-		void addPixel(coord c)
+		void addPixel(const coord &c)
 		{
 			pixels.push_back(pix(c.x,c.y));
 		}
@@ -160,7 +160,7 @@
 	
 	box b;
 	b.position.set(50,50,50,50);
-	b.setDrag(window::ALLDRAG);
+	b.setDrag(M_AllDrag);
 	
 	checkBox c;
 	c.position.set(100,100,25,25);
@@ -194,9 +194,7 @@
 		bs.render();
 		
 		guiManager::renderWindows();
-		guiManager::renderToScreen();
 		
-		
 		PA_WaitForVBL();
 	}
 	

Modified: trunk/src/widgets/listbox.cpp
===================================================================
--- trunk/src/widgets/listbox.cpp	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/src/widgets/listbox.cpp	2007-07-28 19:42:23 UTC (rev 453)
@@ -57,7 +57,7 @@
 		chosen.onKeyPress.connect(this,&listBox::mainKeyPress);
 	
 		addChild(&showListButton);
-		showListButton.onButtonClick.connect(this,&listBox::showPopUp);
+		showListButton.clicked.connect(this,&listBox::showPopUp);
 		showListButton.onPaint.connect(this,&listBox::drawOnButton);
 		
 		popUp.addChild(&sideBar);
@@ -167,7 +167,7 @@
 		mouseManager::setPosition(int(itemList[highlightedItem]->getRelativePosition().getX2() - (itemList[highlightedItem]->position.width/2)),int(itemList[highlightedItem]->getRelativePosition().getY2() - (itemList[highlightedItem]->position.height/2)));
 	}
 	
-	slot listBox::showPopUp(const coord &c)
+	slot listBox::showPopUp(const coord &pos)
 	{
 		showPopUp();
 	}

Modified: trunk/src/widgets/scroll_bar.cpp
===================================================================
--- trunk/src/widgets/scroll_bar.cpp	2007-07-27 17:38:34 UTC (rev 452)
+++ trunk/src/widgets/scroll_bar.cpp	2007-07-28 19:42:23 UTC (rev 453)
@@ -67,14 +67,14 @@
 		topButton.onScrollWheelUp.connect(this,&scrollBar::scrollWheelUp);
 		topButton.onScrollWheelDown.connect(this,&scrollBar::scrollWheelDown);
 		topButton.onPaint.connect(this,&scrollBar::drawButtonTop);
-		topButton.onButtonDown.connect(this,&scrollBar::topButtonDown);
-		topButton.onButtonRelease.connect(this,&scrollBar::topButtonUp);
+		topButton.pressed.connect(this,&scrollBar::topButtonDown);
+		topButton.released.connect(this,&scrollBar::topButtonUp);
 		
 		bottomButton.onScrollWheelUp.connect(this,&scrollBar::scrollWheelUp);
 		bottomButton.onScrollWheelDown.connect(this,&scrollBar::scrollWheelDown);
 		bottomButton.onPaint.connect(this,&scrollBar::drawButtonBottom);
-		bottomButton.onButtonDown.connect(this,&scrollBar::bottomButtonDown);
-		bottomButton.onButtonRelease.connect(this,&scrollBar::bottomButtonUp);
+		bottomButton.pressed.connect(this,&scrollBar::bottomButtonDown);
+		bottomButton.released.connect(this,&scrollBar::bottomButtonUp);
 		
 		middleButton.setDrag(M_NoDrag);
 		middleButton.onMove.connect(this,&scrollBar::middleButtonMove);
@@ -168,24 +168,24 @@
 	{
 		scrollDown(scrollWheelIncrement);
 	}
-	void scrollBar::topButtonDown()
+	slot scrollBar::topButtonDown(const coord &pos)
 	{
 		if(!mouseDown)clickTimer.reset();
 		mouseDown=true;
 		buttonDir = BUTTONUP;
 	}
-	void scrollBar::topButtonUp()
+	slot scrollBar::topButtonUp(const coord &pos)
 	{
 		mouseDown= clickPaused =false;
 		buttonDir = NONE;
 	}
-	void scrollBar::bottomButtonDown()
+	slot scrollBar::bottomButtonDown(const coord &pos)
 	{
 		if(!mouseDown)clickTimer.reset();
 		mouseDown=true;
 		buttonDir = BUTTONDOWN;
 	}
-	void scrollBar::bottomButtonUp()
+	slot scrollBar::bottomButtonUp(const coord &pos)
 	{
 		mouseDown= clickPaused =false;
 		buttonDir = NONE;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Saggui-svn] SF.net SVN: saggui: [453] trunk (Page 9)

saggui-svn