[aedGUI-cvs] aedGUI/include aedXmlFile.h,1.2,1.3 aedWindow.h,1.37,1.38 aedTheme.h,1.10,1.11 aedTextBox.h,1.13,1.14 aedStaticText.h,1.15,1.16 aedStaticRTF.h,1.2,1.3 aedStaticImage.h,1.3,1.4 aedSpinner.h,1.5,1.6 aedSlider.h,1.9,1.10 aedSizer.h,1.2,1.3 aedScrollBar.h,1.15,1.16 aedRadioButtonGroup.h,1.10,1.11 aedProgressBar.h,1.7,1.8 aedMenuBar.h,1.5,1.6 aedMenu.h,1.6,1.7 aedListBox.h,1.6,1.7 aedGui.h,1.15,1.16 aedFrame.h,1.6,1.7 aedDialogBox.h,1.4,1.5 aedCheckBox.h,1.11,1.12 aedButton.h,1.11,1.12 aedBoxSizer.h,1.2,1.3 aedApp.h,1.14,1.15 aedAnimatedImage.h,1.3,1.4

[<ala...@us...>]

Update of /cvsroot/aedgui/aedGUI/include
In directory sc8-pr-cvs1:/tmp/cvs-serv2882

Modified Files:
	aedXmlFile.h aedWindow.h aedTheme.h aedTextBox.h 
	aedStaticText.h aedStaticRTF.h aedStaticImage.h aedSpinner.h 
	aedSlider.h aedSizer.h aedScrollBar.h aedRadioButtonGroup.h 
	aedProgressBar.h aedMenuBar.h aedMenu.h aedListBox.h aedGui.h 
	aedFrame.h aedDialogBox.h aedCheckBox.h aedButton.h 
	aedBoxSizer.h aedApp.h aedAnimatedImage.h 
Log Message:
aedWindow renamed to aedWidget; new aedWindow class started

Index: aedXmlFile.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedXmlFile.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** aedXmlFile.h	22 Sep 2003 15:26:53 -0000	1.2
--- aedXmlFile.h	25 Oct 2003 00:06:01 -0000	1.3
***************
*** 12,17 ****
  {
  public:
! 	bool loadFromFile(const std::string & fileName, aedWindow * parent);
! 	bool loadFromString(const std::string & xml, aedWindow * parent);
  
  	std::string getError();
--- 12,17 ----
  {
  public:
! 	bool loadFromFile(const std::string & fileName, aedWidget * parent);
! 	bool loadFromString(const std::string & xml, aedWidget * parent);
  
  	std::string getError();
***************
*** 21,40 ****
  
  private:
! 	bool parseElement(TiXmlElement * element, aedWindow * parent);
! 	bool parseChildElements(TiXmlElement * element, aedWindow * parent);
  
! 	bool parseWindow(TiXmlElement * element, aedWindow * parent);
! 	bool parseStaticText(TiXmlElement * element, aedWindow * parent);
!     bool parseButton(TiXmlElement * element, aedWindow * parent);
! 	bool parseTextBox(TiXmlElement * element, aedWindow * parent);
! 	bool parseProgressBar(TiXmlElement * element, aedWindow * parent);
! 	bool parseFrame(TiXmlElement * element, aedWindow * parent);
! 	bool parseCheckBox(TiXmlElement * element, aedWindow * parent);
! 	bool parseStaticImage(TiXmlElement * element, aedWindow * parent);
! 	bool parseSlider(TiXmlElement * element, aedWindow * parent);
! 	bool parseScrollBar(TiXmlElement * element, aedWindow * parent);
! 	bool parseRadioButtonGroup(TiXmlElement * element, aedWindow * parent);
! 	bool parseListBox(TiXmlElement * element, aedWindow * parent);
! 	bool parseSpinner(TiXmlElement * element, aedWindow * parent);
  
  	std::string safeExtractString(TiXmlElement * element, const std::string & attributeName);
--- 21,40 ----
  
  private:
! 	bool parseElement(TiXmlElement * element, aedWidget * parent);
! 	bool parseChildElements(TiXmlElement * element, aedWidget * parent);
  
! 	bool parseWindow(TiXmlElement * element, aedWidget * parent);
! 	bool parseStaticText(TiXmlElement * element, aedWidget * parent);
!     bool parseButton(TiXmlElement * element, aedWidget * parent);
! 	bool parseTextBox(TiXmlElement * element, aedWidget * parent);
! 	bool parseProgressBar(TiXmlElement * element, aedWidget * parent);
! 	bool parseFrame(TiXmlElement * element, aedWidget * parent);
! 	bool parseCheckBox(TiXmlElement * element, aedWidget * parent);
! 	bool parseStaticImage(TiXmlElement * element, aedWidget * parent);
! 	bool parseSlider(TiXmlElement * element, aedWidget * parent);
! 	bool parseScrollBar(TiXmlElement * element, aedWidget * parent);
! 	bool parseRadioButtonGroup(TiXmlElement * element, aedWidget * parent);
! 	bool parseListBox(TiXmlElement * element, aedWidget * parent);
! 	bool parseSpinner(TiXmlElement * element, aedWidget * parent);
  
  	std::string safeExtractString(TiXmlElement * element, const std::string & attributeName);

Index: aedWindow.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedWindow.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** aedWindow.h	7 Oct 2003 01:19:36 -0000	1.37
--- aedWindow.h	25 Oct 2003 00:06:01 -0000	1.38
***************
*** 1,342 ****
! /*
!  * The aedWindow class
!  * The "visible widgets" base class
!  * Initial design by Eduardo B. Fonseca <eb...@ae...>
!  *
!  * This library is free software; you can redistribute it and/or
!  * modify it under the terms of the GNU Library General Public
!  * License as published by the Free Software Foundation; either
!  * version 2 of the License, or (at your option) any later version.
!  *
!  * This library is distributed in the hope that it will be useful,
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
!  * Library General Public License for more details.
!  *
!  * You should have received a copy of the GNU Library General Public
!  * License along with this library; if not, write to the Free
!  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  *
!  */
! 
  #ifndef AEDWINDOW_H
  #define AEDWINDOW_H
  
! #include "aedObject.h"
! #include "aedRect.h"
! #include "aedColor.h"
! #include "aedFont.h"
! #include "aedTheme.h"
! #include "aedApp.h"
! 
! #define sgn(x) ((x<0)?-1:((x>0)?1:0))
! 
! #define TAKEOVERX -1
! #define TAKEOVERY -1
! #define CENTERX -2
! #define CENTERY -2
! #define FULLX -3
! #define FULLY -3
! #define TAKEOVERPARENT TAKEOVERX, TAKEOVERY
! 
! /////////////////////////////////////
! // TODO: we need to change this to a real event class... one we can use
! // on the aedEventManager and on the aedSignal class.
! struct aedKeyEvent
! {
!     Uint16 sym;
!     Uint16 unicode;
! };
! 
! // Justifications
! enum aedJusts
! {
!     AED_JUST_LEFT = 1,
!     AED_JUST_CENTER,
!     AED_JUST_RIGHT
! };
! 
! // Border types
! enum
! {
!     AED_BORDER_NONE = 0,
!     AED_BORDER_ROUND = 1,
!     AED_BORDER_SQUARED = 2
! };
  
! const Uint16 cPad = 3;
  
! class DLLEXPORT aedWindow:public aedObject
  {
!   public:
!     aedWindow();
!     virtual ~ aedWindow();
! 
!     // The root constructor
!     aedWindow(Uint16 screenWidth, Uint16 screenHeight, bool takeOverScreen =
!               true);
! 
!     // The CREATE function
!     virtual void create(aedWindow * parent = NULL, aedRect pos =
!                         aedDEFAULTPOSITION, std::string caption =
!                         "");
! 
!     // Basic Functions
!     void setStatic(bool value)
!     {
!         m_IsStatic = value;
!     }
! 	
!     virtual void enable(bool value)
!     {
! 	m_IsEnabled = value;
! 	setRenderState(true);
!     }
! 	
!     void show(void)
!     {
!         m_ShowWindow = true;
!         setRenderState(true);
!     }
!     void hide(void)
!     {
!         m_ShowWindow = false;
! 		if(getParent())
! 			getParent()->setRenderState(true);
!     }
!     bool isVisible(void) const
!     {
!         return m_ShowWindow;
!     }
!     void bringToTop(void);
!     bool hasFocus() const;
!     aedWindow *getTopMostWidget();
! 
!     // Coords
!     Uint16 getScreenWidth(void) const
!     {
!         return m_ScreenWidth;
!     }
!     Uint16 getScreenHeight(void) const
!     {
!         return m_ScreenHeight;
!     }
!     void setPos(Sint16 x, Sint16 y);
!     void setSize(Sint16 w, Sint16 h);
! 
!     void screenToClient(Uint16 & x, Uint16 & y);
!     Uint16 clientxToScreen(Uint16 x = 0);
!     Uint16 clientyToScreen(Uint16 y = 0);
!     Sint32 clientwToScreen(Sint32 w = 0);
!     Sint32 clienthToScreen(Sint32 h = 0);
! 
!     aedRect getPositionOffset(void);
!     aedRect getPos(void);
!     aedRect getPosition(void);
!     aedRect getMyTranslatedPosition(void);
!     aedRect getRealPos(void)
!     {
!         return getMyPosition();
!     }
! 
!     // Drawing Functions
!     bool getRenderState(void) const
!     {
!         return m_ReRender;
!     }
!     void setRenderState(bool status)
!     {
!         m_ReRender = status;
!         if(m_ReRender)
!             makeAllDirty();
!     }
! 
!     void renderAll(SDL_Surface * screen = NULL);
! 
!     virtual void render(void);
!     aedColor getBGColor(void) const
!     {
!         return m_BGColor;
!     }
! 
!     void setBGColor(aedColor color)
!     {
!         m_BGColor = color;
!     }
!     void setActiveBorder(bool value)
!     {
!         m_HasActiveBorder = value;
!     }
!     bool getActiveBorder(void) const
!     {
!         return m_HasActiveBorder;
!     }
! 
!     void setAlphaValue(Uint8 alpha);
!     Uint8 getAlphaValue(void) const
!     {
!         return m_AlphaValue;
!     }
! 
!     bool isMouseOver(void);
! 
!     // Caption Functions
!     virtual void setCaption(const std::string & caption)
!     {
!         m_Caption = caption;
!     }
!     virtual std::string getCaption(void) const
!     {
!         return m_Caption;
!     }
! 
!     // Border stuff
!     int getBorder() const
!     {
!         return m_Border;
!     }
!     void setBorder(int border)
!     {
!         if(m_Border != border)
!         {
!             m_Border = border;
!             setRenderState(true);
!         }
!     }
! 
!     aedColor getBorderColor() const
!     {
!         return m_BorderColor;
!     }
!     void setBorderColor(aedColor color)
!     {
!         m_BorderColor = color;
!         setRenderState(true);
!     }
! 
!     void setFont(aedFont * font)
!     {
!         m_Font = font;
!         setRenderState(true);
!     }
!     aedFont *getFont() const
!     {
!         return m_Font;
!     }
! 
!     void setTheme(aedTheme * Theme);
  
!     aedTheme *getTheme() const
!     {
!         return m_Theme;
!     }
  
!     aedWindow *findWindow(const std::string & id);
!     aedWindow *findWindow(aedWindow *pointer);
!     bool addWindow(aedWindow * win);
!     bool removeWindow(aedWindow * win);
!     aedWindow *getParent() const
!     {
!         return m_Parent;
!     }
  
-     // Messages
-     virtual int wm_paint(SDL_Surface * screen = NULL, Uint16 x = 0, Uint16 y =
-                          0, Uint16 w = 0, Uint16 h = 0);
      virtual int wm_lbuttondown(Uint16 x, Uint16 y);
      virtual int wm_lbuttonup(Uint16 x, Uint16 y);
! 	virtual int wm_rbuttondown(Uint16 x, Uint16 y);
! 	virtual int wm_rbuttonup(Uint16 x, Uint16 y);
!     virtual int wm_sizechanged(Uint16 screenWidth, Uint16 screenHeight);
!     virtual int wm_keydown(aedKeyEvent & event);
!     virtual int wm_update(Uint32 msdelta);
!     virtual int wm_gotfocus() { return 0; }
!     virtual int wm_lostfocus() { return 0; }
!     virtual int wm_mouseenter() { return 0; }
!     virtual int wm_mouseleave() { return 0; }
! 	virtual int wm_mousemove(Uint16 x, Uint16 y) { return 0; }
! 	
!     bool isEnabled() const
!     {
!         if (getParent())
!             return m_IsEnabled && getParent()->isEnabled();
!         return m_IsEnabled;
!     }
! 	
!     void update();
!     
!     void setId(const std::string & id);
! 
!     const std::string & getId() const
!     {
!         return m_Id;
!     }
! 
!     void setUserData(void *userdata)
!     {
!         m_userdata = userdata;
!     }
! 
!     void *getUserData()
!     {
!         return m_userdata;
!     }
! 
!     bool pollEvent(SDL_Event * event);
! 
!   protected:
!     aedRect getMyPosition(void);
!     void init(void);
! 
!   private:
!     void processEvent(SDL_Event * event);
!     aedWindow *findChildAtCoord(Uint16 x, Uint16 y, Uint8 flags = 0);
!     void makeAllDirty(void);
!     void updateAllChildren(Uint32 msdelta);
  
!   protected:
!     std::string m_Caption;
!     bool m_IsEnabled:1;
!     bool m_IsStatic:1;
!     bool m_CanFocus:1;
!     bool m_IsWidget:1;
!     bool m_ShowWindow:1;
!     bool m_ReRender:1;
!     bool m_HasActiveBorder:1;
!     int m_Border;
!     aedColor m_BorderColor;
!     aedColor m_BGColor;
! 	
!     aedFont *m_Font;
!     aedTheme *m_Theme;
  
!     // The widget's drawing surface.
!     SDL_Surface *m_Surface;
  
!     Uint8 m_AlphaValue;
!     Uint8 m_Flags;
  
!     // The widget position, in aedGUI Virtual Units (AVU)
!     aedRect m_Pos;
  
!     // Here we "cache" the widget position in pixel values
!     aedRect m_PixelPos;
  
!     // Position Offset
!     aedRect m_PositionOffset;
  
!   private:
!     std::string m_Id;
!     void *m_userdata;
!     aedWindow *m_Parent;
  
!     std::vector < aedWindow * >m_Children;
!     Uint32 m_CurTicks, m_LastTicks;
  
!     Uint16 m_ScreenWidth, m_ScreenHeight;
  };
  
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg<stub, aedWindow>;
  #endif
  
--- 1,102 ----
! 
  #ifndef AEDWINDOW_H
  #define AEDWINDOW_H
  
! #include "dllmacros.h"
! #include "aedWidget.h"
! #include "aedStaticText.h"
! #include "aedButton.h"
  
! enum aedWinFlags
! {
!     WF_PLAIN = 0,
! 
!     WF_RESIZEABLE = 1,
!     WF_MOVEABLE = 2,
! 
!     WF_TITLEBAR = 4,
!     WF_CLOSEBUTTON = 8,
!     WF_MAXBUTTON = 16,
!     WF_MINBUTTON = 32,
! };
! 
! const Uint32 WF_NORMAL = WF_RESIZEABLE | WF_MOVEABLE | WF_TITLEBAR  | WF_CLOSEBUTTON;
  
! class DLLEXPORT aedWindow : public aedWidget
  {
! public:
! 	aedWindow();
! 	virtual ~ aedWindow();
  
! 	virtual void create(aedWidget * parent = NULL, aedRect pos = aedDEFAULTPOSITION, 
! 						std::string caption = "", Uint32 flags = WF_NORMAL);
  
! 	virtual void render(void);
  
      virtual int wm_lbuttondown(Uint16 x, Uint16 y);
      virtual int wm_lbuttonup(Uint16 x, Uint16 y);
! 	virtual int wm_mousemove(Uint16 x, Uint16 y, Uint16 dx, Uint16 dy);
  
! 	virtual void setCaption(const std::string & caption)
! 	{
! 		m_Caption = caption;
! 		m_CaptionLabel->setCaption(caption);
! 	}
  
! 	aedWidget * getClientArea()
! 	{
! 		return &m_ClientArea;
! 	}
  
! 	virtual bool addWindow(aedWidget * win)
! 	{
! 		if (m_InitComplete == false || win->getUserData() == this)
! 		{
! 			return aedWidget::addWindow(win);
! 		}
! 		else
! 		{
! 			return m_ClientArea.addWindow(win);
! 		}
! 	}
  
! 	virtual bool removeWindow(aedWidget * win)
! 	{
! 		if (m_InitComplete == false ||win->getUserData() == this)
! 		{
! 			return aedWidget::removeWindow(win);
! 		}
! 		else
! 		{
! 			return m_ClientArea.removeWindow(win);
! 		}
! 	}
  
! 	void Maximize();
! 	void Minimize();
  
! private:
! 	bool			m_InitComplete;
  
! 	bool			m_Dragging;
! 	bool			m_Moveable;
  
! 	int				m_TitleBarBorderX;
! 	int				m_TitleBarBorderY;
! 	int				m_TitleBarHeight;
  
! 	aedWidget		m_ClientArea;
! 	aedButton *		m_CloseButton;
! 	aedButton *		m_MinimizeButton;
! 	aedButton *		m_MaximizeButton;
! 	aedStaticText *	m_CaptionLabel;
  };
  
+ void __aedInternal__WindowCloseButtonHandler(void * caller, void * data);
+ void __aedInternal__WindowMaxButtonHandler(void * caller, void * data);
+ void __aedInternal__WindowMinButtonHandler(void * caller, void * data);
+ 
  #if defined(_MSC_VER)
! DLLEXTERN template DLLEXPORT aedFunctor1Arg<stub, aedButton>;
  #endif
  

Index: aedTheme.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedTheme.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** aedTheme.h	15 Sep 2003 09:16:18 -0000	1.10
--- aedTheme.h	25 Oct 2003 00:06:01 -0000	1.11
***************
*** 8,12 ****
  
  class aedColor;
! class aedWindow;
  class aedButton;
  class aedStaticText;
--- 8,12 ----
  
  class aedColor;
! class aedWidget;
  class aedButton;
  class aedStaticText;
***************
*** 66,71 ****
  	DRAWFUNC(CheckBox);
  
!     virtual void drawBorder(aedWindow * widget, SDL_Surface * screen);
!     virtual void drawBox(aedWindow * widget, SDL_Surface * screen);
      virtual void drawSquareButton(aedButton * widget, SDL_Surface * screen);
      
--- 66,71 ----
  	DRAWFUNC(CheckBox);
  
!     virtual void drawBorder(aedWidget * widget, SDL_Surface * screen);
!     virtual void drawBox(aedWidget * widget, SDL_Surface * screen);
      virtual void drawSquareButton(aedButton * widget, SDL_Surface * screen);
      

Index: aedTextBox.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedTextBox.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** aedTextBox.h	17 Sep 2003 22:51:55 -0000	1.13
--- aedTextBox.h	25 Oct 2003 00:06:01 -0000	1.14
***************
*** 34,38 ****
      virtual int wm_lbuttondown(Uint16 x, Uint16 y);
  	virtual int wm_lbuttonup(Uint16 x, Uint16 y);
! 	virtual int wm_mousemove(Uint16 x, Uint16 y);
  	virtual int wm_mouseleave();
      virtual int wm_keydown(aedKeyEvent & event);
--- 34,38 ----
      virtual int wm_lbuttondown(Uint16 x, Uint16 y);
  	virtual int wm_lbuttonup(Uint16 x, Uint16 y);
! 	virtual int wm_mousemove(Uint16 x, Uint16 y, Uint16 dx, Uint16 dy);
  	virtual int wm_mouseleave();
      virtual int wm_keydown(aedKeyEvent & event);

Index: aedStaticText.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedStaticText.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** aedStaticText.h	17 Sep 2003 14:51:35 -0000	1.15
--- aedStaticText.h	25 Oct 2003 00:06:01 -0000	1.16
***************
*** 23,32 ****
  #define AEDSTATICTEXT_H
  
! #include "aedWindow.h"
  #include "aedFont.h"
  
  /** This class is used for displaying labels and is the base class for
   * the textbox widget. */
! class DLLEXPORT aedStaticText:public aedWindow
  {
    public:
--- 23,32 ----
  #define AEDSTATICTEXT_H
  
! #include "aedWidget.h"
  #include "aedFont.h"
  
  /** This class is used for displaying labels and is the base class for
   * the textbox widget. */
! class DLLEXPORT aedStaticText:public aedWidget
  {
    public:

Index: aedStaticRTF.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedStaticRTF.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** aedStaticRTF.h	16 Sep 2003 22:34:43 -0000	1.2
--- aedStaticRTF.h	25 Oct 2003 00:06:01 -0000	1.3
***************
*** 24,32 ****
  
  #include "dllmacros.h"
! #include "aedWindow.h"
  
  typedef struct _RTF_Context RTF_Context;
  
! class DLLEXPORT aedStaticRTF:public aedWindow
  {
    public:
--- 24,32 ----
  
  #include "dllmacros.h"
! #include "aedWidget.h"
  
  typedef struct _RTF_Context RTF_Context;
  
! class DLLEXPORT aedStaticRTF:public aedWidget
  {
    public:

Index: aedStaticImage.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedStaticImage.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aedStaticImage.h	16 Sep 2003 22:34:43 -0000	1.3
--- aedStaticImage.h	25 Oct 2003 00:06:01 -0000	1.4
***************
*** 23,30 ****
  #define AEDSTATICIMAGE_H
  
! #include "aedWindow.h"
  #include "aedImage.h"
  
! class DLLEXPORT aedStaticImage:public aedWindow
  {
    public:
--- 23,30 ----
  #define AEDSTATICIMAGE_H
  
! #include "aedWidget.h"
  #include "aedImage.h"
  
! class DLLEXPORT aedStaticImage:public aedWidget
  {
    public:

Index: aedSpinner.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedSpinner.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** aedSpinner.h	16 Sep 2003 22:34:43 -0000	1.5
--- aedSpinner.h	25 Oct 2003 00:06:01 -0000	1.6
***************
*** 22,35 ****
  #define AEDSPINNER_H
  
! #include "aedWindow.h"
  #include "aedTextBox.h"
  #include "aedButton.h"
  
  
! class DLLEXPORT aedSpinner:public aedWindow
  {
    public:
      aedSpinner();
!     virtual void create(aedWindow * parent = NULL, aedRect pos =
                          aedDEFAULTPOSITION, std::string caption =
                          "");
--- 22,35 ----
  #define AEDSPINNER_H
  
! #include "aedWidget.h"
  #include "aedTextBox.h"
  #include "aedButton.h"
  
  
! class DLLEXPORT aedSpinner:public aedWidget
  {
    public:
      aedSpinner();
!     virtual void create(aedWidget * parent = NULL, aedRect pos =
                          aedDEFAULTPOSITION, std::string caption =
                          "");

Index: aedSlider.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedSlider.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** aedSlider.h	16 Sep 2003 22:34:43 -0000	1.9
--- aedSlider.h	25 Oct 2003 00:06:01 -0000	1.10
***************
*** 23,27 ****
  #define AEDSLIDER_H
  
! #include "aedWindow.h"
  
  // How to document enums?
--- 23,27 ----
  #define AEDSLIDER_H
  
! #include "aedWidget.h"
  
  // How to document enums?
***************
*** 35,39 ****
  /** A very simple base class containing common code for
   * sliders and scrollbars. */
! class DLLEXPORT aedSlider:public aedWindow
  {
    public:
--- 35,39 ----
  /** A very simple base class containing common code for
   * sliders and scrollbars. */
! class DLLEXPORT aedSlider:public aedWidget
  {
    public:

Index: aedSizer.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedSizer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** aedSizer.h	20 Oct 2003 15:08:29 -0000	1.2
--- aedSizer.h	25 Oct 2003 00:06:01 -0000	1.3
***************
*** 2,6 ****
  #define AEDSIZER_H
  
! #include "aedWindow.h"
  
  class DLLEXPORT aedSizer
--- 2,6 ----
  #define AEDSIZER_H
  
! #include "aedWidget.h"
  
  class DLLEXPORT aedSizer
***************
*** 8,19 ****
  	public:
  		aedSizer();
! 		aedSizer(aedWindow *parent);
  		virtual ~aedSizer();
! 		void		addWidget(aedWindow *widget);
  		virtual void	calculateSize(void) = 0;
  
  	protected:
! 		aedWindow			*m_Parent;
! 		std::vector<aedWindow *>	m_Widgets;
  };
  
--- 8,19 ----
  	public:
  		aedSizer();
! 		aedSizer(aedWidget *parent);
  		virtual ~aedSizer();
! 		void		addWidget(aedWidget *widget);
  		virtual void	calculateSize(void) = 0;
  
  	protected:
! 		aedWidget			*m_Parent;
! 		std::vector<aedWidget *>	m_Widgets;
  };
  

Index: aedScrollBar.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedScrollBar.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** aedScrollBar.h	16 Sep 2003 22:34:43 -0000	1.15
--- aedScrollBar.h	25 Oct 2003 00:06:01 -0000	1.16
***************
*** 32,36 ****
      virtual ~ aedScrollBar();
  
!     virtual void create(aedWindow * parent = NULL, aedRect pos =
                          aedDEFAULTPOSITION, std::string caption =
                          "");
--- 32,36 ----
      virtual ~ aedScrollBar();
  
!     virtual void create(aedWidget * parent = NULL, aedRect pos =
                          aedDEFAULTPOSITION, std::string caption =
                          "");

Index: aedRadioButtonGroup.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedRadioButtonGroup.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** aedRadioButtonGroup.h	17 Sep 2003 14:51:35 -0000	1.10
--- aedRadioButtonGroup.h	25 Oct 2003 00:06:01 -0000	1.11
***************
*** 24,32 ****
  
  #include "dllmacros.h"
! #include "aedWindow.h"
  #include "aedCheckBox.h"
  
  /** Implements radio buttons (radio button groups, as we call them). */
! class DLLEXPORT aedRadioButtonGroup:public aedWindow
  {
    public:
--- 24,32 ----
  
  #include "dllmacros.h"
! #include "aedWidget.h"
  #include "aedCheckBox.h"
  
  /** Implements radio buttons (radio button groups, as we call them). */
! class DLLEXPORT aedRadioButtonGroup:public aedWidget
  {
    public:

Index: aedProgressBar.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedProgressBar.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** aedProgressBar.h	16 Sep 2003 22:34:43 -0000	1.7
--- aedProgressBar.h	25 Oct 2003 00:06:01 -0000	1.8
***************
*** 23,31 ****
  #define AEDPROGRESSBAR_H
  
! #include "aedWindow.h"
  #include "aedStaticText.h"
  
  /** This class implements a nice progress bar. */
! class DLLEXPORT aedProgressBar:public aedWindow
  {
    public:
--- 23,31 ----
  #define AEDPROGRESSBAR_H
  
! #include "aedWidget.h"
  #include "aedStaticText.h"
  
  /** This class implements a nice progress bar. */
! class DLLEXPORT aedProgressBar:public aedWidget
  {
    public:

Index: aedMenuBar.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedMenuBar.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** aedMenuBar.h	18 Sep 2003 20:56:42 -0000	1.5
--- aedMenuBar.h	25 Oct 2003 00:06:01 -0000	1.6
***************
*** 25,29 ****
  /** The aedMenuBar class, used for creating simple menu bars,
   * obviously. */
! class DLLEXPORT aedMenuBar:public aedWindow
  {
    public:
--- 25,29 ----
  /** The aedMenuBar class, used for creating simple menu bars,
   * obviously. */
! class DLLEXPORT aedMenuBar:public aedWidget
  {
    public:
***************
*** 47,51 ****
  
      int wm_lbuttondown(Uint16 x, Uint16 y);
!     int wm_mousemove(Uint16 x, Uint16 y);
      int wm_mouseleave();
      void render();
--- 47,51 ----
  
      int wm_lbuttondown(Uint16 x, Uint16 y);
!     int wm_mousemove(Uint16 x, Uint16 y, Uint16 dx, Uint16 dy);
      int wm_mouseleave();
      void render();

Index: aedMenu.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedMenu.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** aedMenu.h	18 Sep 2003 20:56:42 -0000	1.6
--- aedMenu.h	25 Oct 2003 00:06:01 -0000	1.7
***************
*** 21,25 ****
  #define AEDMENU_H
  
! #include "aedWindow.h"
  
  struct DLLEXPORT aedMenuItem
--- 21,25 ----
  #define AEDMENU_H
  
! #include "aedWidget.h"
  
  struct DLLEXPORT aedMenuItem
***************
*** 30,34 ****
  
  /** This is a simple menu class. */
! class DLLEXPORT aedMenu:public aedWindow
  {
    public:
--- 30,34 ----
  
  /** This is a simple menu class. */
! class DLLEXPORT aedMenu:public aedWidget
  {
    public:
***************
*** 48,52 ****
  
      int wm_lbuttondown(Uint16 x, Uint16 y);
!     int wm_mousemove(Uint16 x, Uint16 y);
      int wm_mouseleave();
      int wm_mouseenter();
--- 48,52 ----
  
      int wm_lbuttondown(Uint16 x, Uint16 y);
!     int wm_mousemove(Uint16 x, Uint16 y, Uint16 dx, Uint16 dy);
      int wm_mouseleave();
      int wm_mouseenter();

Index: aedListBox.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedListBox.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** aedListBox.h	16 Sep 2003 22:34:43 -0000	1.6
--- aedListBox.h	25 Oct 2003 00:06:01 -0000	1.7
***************
*** 23,30 ****
  #define AEDLISTBOX_H
  
! #include "aedWindow.h"
  #include "aedFont.h"
  
! class DLLEXPORT aedListBox:public aedWindow
  {
    public:
--- 23,30 ----
  #define AEDLISTBOX_H
  
! #include "aedWidget.h"
  #include "aedFont.h"
  
! class DLLEXPORT aedListBox:public aedWidget
  {
    public:

Index: aedGui.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedGui.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** aedGui.h	28 Sep 2003 03:09:50 -0000	1.15
--- aedGui.h	25 Oct 2003 00:06:01 -0000	1.16
***************
*** 3,6 ****
--- 3,7 ----
  #include "dllmacros.h"
  #include "aedTimer.h"
+ #include "aedWidget.h"
  #include "aedWindow.h"
  #include "aedStaticText.h"

Index: aedFrame.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedFrame.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** aedFrame.h	16 Sep 2003 22:34:43 -0000	1.6
--- aedFrame.h	25 Oct 2003 00:06:01 -0000	1.7
***************
*** 24,33 ****
  
  #include "dllmacros.h"
! #include "aedWindow.h"
  #include "aedFont.h"
  
  /** The aedFrame class serves mainly to group related options
   * together. */
! class DLLEXPORT aedFrame:public aedWindow
  {
    public:
--- 24,33 ----
  
  #include "dllmacros.h"
! #include "aedWidget.h"
  #include "aedFont.h"
  
  /** The aedFrame class serves mainly to group related options
   * together. */
! class DLLEXPORT aedFrame:public aedWidget
  {
    public:

Index: aedDialogBox.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedDialogBox.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** aedDialogBox.h	16 Sep 2003 22:34:43 -0000	1.4
--- aedDialogBox.h	25 Oct 2003 00:06:01 -0000	1.5
***************
*** 24,30 ****
  
  #include "dllmacros.h"
! #include "aedWindow.h"
  
! class DLLEXPORT aedDialogBox:public aedWindow
  {
      virtual void render(void);
--- 24,30 ----
  
  #include "dllmacros.h"
! #include "aedWidget.h"
  
! class DLLEXPORT aedDialogBox:public aedWidget
  {
      virtual void render(void);

Index: aedCheckBox.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedCheckBox.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** aedCheckBox.h	17 Sep 2003 14:51:35 -0000	1.11
--- aedCheckBox.h	25 Oct 2003 00:06:01 -0000	1.12
***************
*** 24,31 ****
  
  #include "dllmacros.h"
! #include "aedWindow.h"
  
  /** The checkbox class. */
! class DLLEXPORT aedCheckBox:public aedWindow
  {
    public:
--- 24,31 ----
  
  #include "dllmacros.h"
! #include "aedWidget.h"
  
  /** The checkbox class. */
! class DLLEXPORT aedCheckBox:public aedWidget
  {
    public:

Index: aedButton.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedButton.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** aedButton.h	17 Sep 2003 14:51:35 -0000	1.11
--- aedButton.h	25 Oct 2003 00:06:01 -0000	1.12
***************
*** 24,28 ****
  
  #include "dllmacros.h"
! #include "aedWindow.h"
  #include "aedImage.h"
  #include "aedStaticText.h"
--- 24,28 ----
  
  #include "dllmacros.h"
! #include "aedWidget.h"
  #include "aedImage.h"
  #include "aedStaticText.h"
***************
*** 40,44 ****
  /** The button class. Implements ordinary and toggled buttons.
   */
! class DLLEXPORT aedButton:public aedWindow
  {
    public:
--- 40,44 ----
  /** The button class. Implements ordinary and toggled buttons.
   */
! class DLLEXPORT aedButton:public aedWidget
  {
    public:

Index: aedBoxSizer.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedBoxSizer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** aedBoxSizer.h	20 Oct 2003 15:08:29 -0000	1.2
--- aedBoxSizer.h	25 Oct 2003 00:06:01 -0000	1.3
***************
*** 13,17 ****
  {
  	public:
! 		aedBoxSizer(aedWindow *parent, boxType type);
  		virtual void	calculateSize(void);
  	private:
--- 13,17 ----
  {
  	public:
! 		aedBoxSizer(aedWidget *parent, boxType type);
  		virtual void	calculateSize(void);
  	private:

Index: aedApp.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedApp.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** aedApp.h	8 Sep 2003 19:55:50 -0000	1.14
--- aedApp.h	25 Oct 2003 00:06:01 -0000	1.15
***************
*** 8,12 ****
  #include "dllmacros.h"
  #include "aedFont.h"
! #include "aedWindow.h"
  #include "aedLog.h"
  #include "aedTheme.h"
--- 8,12 ----
  #include "dllmacros.h"
  #include "aedFont.h"
! #include "aedWidget.h"
  #include "aedLog.h"
  #include "aedTheme.h"
***************
*** 100,104 ****
  
      /** Set the application's root window. */
!     void setRoot(aedWindow * w)
      {
          m_Root = w;
--- 100,104 ----
  
      /** Set the application's root window. */
!     void setRoot(aedWidget * w)
      {
          m_Root = w;
***************
*** 106,110 ****
  
      /** Get the root window. */
!     aedWindow *getRoot() const
      {
          return m_Root;
--- 106,110 ----
  
      /** Get the root window. */
!     aedWidget *getRoot() const
      {
          return m_Root;
***************
*** 131,138 ****
  
      /** Return a pointer to the widget that has focus. */
!     aedWindow *getFocusWindow() const { return m_FocusWindow; }
      
      /** Set focus. */
!     void setFocusWindow(aedWindow *win);
  
      /** Enable or disable UTF8 text rendering.
--- 131,138 ----
  
      /** Return a pointer to the widget that has focus. */
!     aedWidget *getFocusWindow() const { return m_FocusWindow; }
      
      /** Set focus. */
!     void setFocusWindow(aedWidget *win);
  
      /** Enable or disable UTF8 text rendering.
***************
*** 150,155 ****
      std::vector < aedThemeEntry > m_Themes;     // loaded themes
      std::string m_DefaultFontName;
!     aedWindow *m_Root;
!     aedWindow *m_FocusWindow;
  	
  	bool m_UTF8;
--- 150,155 ----
      std::vector < aedThemeEntry > m_Themes;     // loaded themes
      std::string m_DefaultFontName;
!     aedWidget *m_Root;
!     aedWidget *m_FocusWindow;
  	
  	bool m_UTF8;

Index: aedAnimatedImage.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedAnimatedImage.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aedAnimatedImage.h	16 Sep 2003 22:34:43 -0000	1.3
--- aedAnimatedImage.h	25 Oct 2003 00:06:01 -0000	1.4
***************
*** 23,31 ****
  #define AEDANIMATEDIMAGE_H
  
! #include "aedWindow.h"
  #include "aedImage.h"
  #include "aedImageBank.h"
  
! class aedAnimatedImage:public aedWindow
  {
    public:
--- 23,31 ----
  #define AEDANIMATEDIMAGE_H
  
! #include "aedWidget.h"
  #include "aedImage.h"
  #include "aedImageBank.h"
  
! class aedAnimatedImage:public aedWidget
  {
    public: