[aedGUI-cvs] aedGUI/include aedWindow.h,1.38,1.39 aedWidget.h,1.1,1.2 aedTheme.h,1.11,1.12 aedApp.h,1.15,1.16

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

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

Modified Files:
	aedWindow.h aedWidget.h aedTheme.h aedApp.h 
Log Message:
Various function/variable name changes to make everything more consistant with having aedWidget as the top level component

Index: aedWindow.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedWindow.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** aedWindow.h	25 Oct 2003 00:06:01 -0000	1.38
--- aedWindow.h	25 Oct 2003 19:23:04 -0000	1.39
***************
*** 49,73 ****
  	}
  
! 	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);
  		}
  	}
--- 49,73 ----
  	}
  
! 	virtual bool addWidget(aedWidget * win)
  	{
  		if (m_InitComplete == false || win->getUserData() == this)
  		{
! 			return aedWidget::addWidget(win);
  		}
  		else
  		{
! 			return m_ClientArea.addWidget(win);
  		}
  	}
  
! 	virtual bool removeWindget(aedWidget * win)
  	{
  		if (m_InitComplete == false ||win->getUserData() == this)
  		{
! 			return aedWidget::removeWidget(win);
  		}
  		else
  		{
! 			return m_ClientArea.removeWidget(win);
  		}
  	}

Index: aedWidget.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedWidget.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** aedWidget.h	25 Oct 2003 18:28:23 -0000	1.1
--- aedWidget.h	25 Oct 2003 19:23:04 -0000	1.2
***************
*** 96,105 ****
      void show(void)
      {
!         m_ShowWindow = true;
          setRenderState(true);
      }
      void hide(void)
      {
!         m_ShowWindow = false;
  		if(getParent())
  			getParent()->setRenderState(true);
--- 96,105 ----
      void show(void)
      {
!         m_ShowWidget = true;
          setRenderState(true);
      }
      void hide(void)
      {
!         m_ShowWidget = false;
  		if(getParent())
  			getParent()->setRenderState(true);
***************
*** 107,111 ****
      bool isVisible(void) const
      {
!         return m_ShowWindow;
      }
      void bringToTop(void);
--- 107,111 ----
      bool isVisible(void) const
      {
!         return m_ShowWidget;
      }
      void bringToTop(void);
***************
*** 232,239 ****
      }
  
!     aedWidget *findWindow(const std::string & id);
!     aedWidget *findWindow(aedWidget *pointer);
!     virtual bool addWindow(aedWidget * win);
!     virtual bool removeWindow(aedWidget * win);
      aedWidget *getParent() const
      {
--- 232,239 ----
      }
  
!     aedWidget *findWidget(const std::string & id);
!     aedWidget *findWidget(aedWidget *pointer);
!     virtual bool addWidget(aedWidget * win);
!     virtual bool removeWidget(aedWidget * win);
      aedWidget *getParent() const
      {
***************
*** 301,305 ****
      bool m_CanFocus:1;
      bool m_IsWidget:1;
!     bool m_ShowWindow:1;
      bool m_ReRender:1;
      bool m_HasActiveBorder:1;
--- 301,305 ----
      bool m_CanFocus:1;
      bool m_IsWidget:1;
!     bool m_ShowWidget:1;
      bool m_ReRender:1;
      bool m_HasActiveBorder:1;

Index: aedTheme.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedTheme.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** aedTheme.h	25 Oct 2003 00:06:01 -0000	1.11
--- aedTheme.h	25 Oct 2003 19:23:05 -0000	1.12
***************
*** 56,60 ****
      aedColor colorButtonOver2;
  
!     aedColor colorDefaultWindowBackground;
  
      // Drawing functions
--- 56,60 ----
      aedColor colorButtonOver2;
  
!     aedColor colorDefaultWidgetBackground;
  
      // Drawing functions

Index: aedApp.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedApp.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** aedApp.h	25 Oct 2003 00:06:01 -0000	1.15
--- aedApp.h	25 Oct 2003 19:23:05 -0000	1.16
***************
*** 39,43 ****
   * 
   * The aedApp class enables you to load custom themes and use memory fonts,
!  * set the application's root window, modify aedGUI's logging behaviour etc.
   * You have to create only one object of this class and it must happen before
   * any widgets are created.
--- 39,43 ----
   * 
   * The aedApp class enables you to load custom themes and use memory fonts,
!  * set the application's root widget, modify aedGUI's logging behaviour etc.
   * You have to create only one object of this class and it must happen before
   * any widgets are created.
***************
*** 99,103 ****
      }
  
!     /** Set the application's root window. */
      void setRoot(aedWidget * w)
      {
--- 99,103 ----
      }
  
!     /** Set the application's root widget. */
      void setRoot(aedWidget * w)
      {
***************
*** 105,109 ****
      }
  
!     /** Get the root window. */
      aedWidget *getRoot() const
      {
--- 105,109 ----
      }
  
!     /** Get the root widget. */
      aedWidget *getRoot() const
      {
***************
*** 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.
--- 131,138 ----
  
      /** Return a pointer to the widget that has focus. */
!     aedWidget *getFocusWidget() const { return m_FocusWidget; }
      
      /** Set focus. */
!     void setFocusWidget(aedWidget *win);
  
      /** Enable or disable UTF8 text rendering.
***************
*** 151,155 ****
      std::string m_DefaultFontName;
      aedWidget *m_Root;
!     aedWidget *m_FocusWindow;
  	
  	bool m_UTF8;
--- 151,155 ----
      std::string m_DefaultFontName;
      aedWidget *m_Root;
!     aedWidget *m_FocusWidget;
  	
  	bool m_UTF8;