[aedGUI-cvs] aedGUI/src aedXmlFile.cpp,1.3,1.4 aedWindow.cpp,1.62,1.63 aedTheme.cpp,1.20,1.21 aedTextBox.cpp,1.28,1.29 aedSpinner.cpp,1.4,1.5 aedSizer.cpp,1.1,1.2 aedScrollBar.cpp,1.23,1.24 aedMenuBar.cpp,1.2,1.3 aedMenu.cpp,1.4,1.5 aedCheckBox.cpp,1.11,1.12 aedButton.cpp,1.20,1.21 aedBoxSizer.cpp,1.2,1.3 aedApp.cpp,1.25,1.26

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

Update of /cvsroot/aedgui/aedGUI/src
In directory sc8-pr-cvs1:/tmp/cvs-serv2782

Modified Files:
	aedXmlFile.cpp aedWindow.cpp aedTheme.cpp aedTextBox.cpp 
	aedSpinner.cpp aedSizer.cpp aedScrollBar.cpp aedMenuBar.cpp 
	aedMenu.cpp aedCheckBox.cpp aedButton.cpp aedBoxSizer.cpp 
	aedApp.cpp 
Log Message:
aedWindow renamed to aedWidget; new aedWindow class started

Index: aedXmlFile.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedXmlFile.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aedXmlFile.cpp	22 Sep 2003 17:19:42 -0000	1.3
--- aedXmlFile.cpp	25 Oct 2003 00:05:18 -0000	1.4
***************
*** 1,3 ****
--- 1,4 ----
  
+ #include "aedWidget.h"
  #include "aedWindow.h"
  #include "aedStaticText.h"
***************
*** 21,25 ****
  #include <iostream>
  
! bool aedXmlFile::loadFromFile(const std::string & fileName, aedWindow * parent)
  {
  	TiXmlDocument doc;
--- 22,26 ----
  #include <iostream>
  
! bool aedXmlFile::loadFromFile(const std::string & fileName, aedWidget * parent)
  {
  	TiXmlDocument doc;
***************
*** 36,40 ****
  }
  
! bool aedXmlFile::loadFromString(const std::string & xml, aedWindow * parent)
  {
  	TiXmlDocument doc;
--- 37,41 ----
  }
  
! bool aedXmlFile::loadFromString(const std::string & xml, aedWidget * parent)
  {
  	TiXmlDocument doc;
***************
*** 58,62 ****
  #define CREATE_IF(e, f) do { if (ElementType == e) return f(element, parent); } while(0);
  
! bool aedXmlFile::parseElement(TiXmlElement * element, aedWindow * parent)
  {
  	std::string ElementType(element->Value());
--- 59,63 ----
  #define CREATE_IF(e, f) do { if (ElementType == e) return f(element, parent); } while(0);
  
! bool aedXmlFile::parseElement(TiXmlElement * element, aedWidget * parent)
  {
  	std::string ElementType(element->Value());
***************
*** 79,83 ****
  }
  
! bool aedXmlFile::parseChildElements(TiXmlElement * element, aedWindow * parent)
  {
  	TiXmlElement * ChildElement = element->FirstChildElement();
--- 80,84 ----
  }
  
! bool aedXmlFile::parseChildElements(TiXmlElement * element, aedWidget * parent)
  {
  	TiXmlElement * ChildElement = element->FirstChildElement();
***************
*** 96,100 ****
  }
  
! bool aedXmlFile::parseWindow(TiXmlElement * element, aedWindow * parent)
  {
  	aedRect Position = safeExtractPosition(element);
--- 97,101 ----
  }
  
! bool aedXmlFile::parseWindow(TiXmlElement * element, aedWidget * parent)
  {
  	aedRect Position = safeExtractPosition(element);
***************
*** 103,107 ****
  
  	aedWindow * window = new aedWindow();
! 	window->create(parent, Position, Caption);
  	window->setId(Name);
  
--- 104,108 ----
  
  	aedWindow * window = new aedWindow();
! 	window->create(parent, Position, Caption, WF_NORMAL);
  	window->setId(Name);
  
***************
*** 111,115 ****
  }
  
! bool aedXmlFile::parseStaticText(TiXmlElement * element, aedWindow * parent)
  {
  	aedRect Position = safeExtractPosition(element);
--- 112,116 ----
  }
  
! bool aedXmlFile::parseStaticText(TiXmlElement * element, aedWidget * parent)
  {
  	aedRect Position = safeExtractPosition(element);
***************
*** 126,130 ****
  }
  
! bool aedXmlFile::parseButton(TiXmlElement * element, aedWindow * parent)
  {
  	aedRect Position = safeExtractPosition(element);
--- 127,131 ----
  }
  
! bool aedXmlFile::parseButton(TiXmlElement * element, aedWidget * parent)
  {
  	aedRect Position = safeExtractPosition(element);
***************
*** 141,145 ****
  }
  
! bool aedXmlFile::parseTextBox(TiXmlElement * element, aedWindow * parent)
  {
  	aedRect Position = safeExtractPosition(element);
--- 142,146 ----
  }
  
! bool aedXmlFile::parseTextBox(TiXmlElement * element, aedWidget * parent)
  {
  	aedRect Position = safeExtractPosition(element);
***************
*** 156,160 ****
  }
  
! bool aedXmlFile::parseProgressBar(TiXmlElement * element, aedWindow * parent)
  {
  	aedRect Position = safeExtractPosition(element);
--- 157,161 ----
  }
  
! bool aedXmlFile::parseProgressBar(TiXmlElement * element, aedWidget * parent)
  {
  	aedRect Position = safeExtractPosition(element);
***************
*** 174,178 ****
  }
  
! bool aedXmlFile::parseFrame(TiXmlElement * element, aedWindow * parent)
  {
  	aedRect Position = safeExtractPosition(element);
--- 175,179 ----
  }
  
! bool aedXmlFile::parseFrame(TiXmlElement * element, aedWidget * parent)
  {
  	aedRect Position = safeExtractPosition(element);
***************
*** 189,193 ****
  }
  
! bool aedXmlFile::parseCheckBox(TiXmlElement * element, aedWindow * parent)
  {
  	aedRect Position = safeExtractPosition(element);
--- 190,194 ----
  }
  
! bool aedXmlFile::parseCheckBox(TiXmlElement * element, aedWidget * parent)
  {
  	aedRect Position = safeExtractPosition(element);
***************
*** 207,211 ****
  }
  
! bool aedXmlFile::parseStaticImage(TiXmlElement * element, aedWindow * parent)
  {
  	aedRect Position = safeExtractPosition(element);
--- 208,212 ----
  }
  
! bool aedXmlFile::parseStaticImage(TiXmlElement * element, aedWidget * parent)
  {
  	aedRect Position = safeExtractPosition(element);
***************
*** 245,249 ****
  }
  
! bool aedXmlFile::parseSlider(TiXmlElement * element, aedWindow * parent)
  {
  	aedRect Position = safeExtractPosition(element);
--- 246,250 ----
  }
  
! bool aedXmlFile::parseSlider(TiXmlElement * element, aedWidget * parent)
  {
  	aedRect Position = safeExtractPosition(element);
***************
*** 285,289 ****
  }
  
! bool aedXmlFile::parseScrollBar(TiXmlElement * element, aedWindow * parent)
  {
  	aedRect Position = safeExtractPosition(element);
--- 286,290 ----
  }
  
! bool aedXmlFile::parseScrollBar(TiXmlElement * element, aedWidget * parent)
  {
  	aedRect Position = safeExtractPosition(element);
***************
*** 325,329 ****
  }
  
! bool aedXmlFile::parseRadioButtonGroup(TiXmlElement * element, aedWindow * parent)
  {
  	aedRect Position = safeExtractPosition(element);
--- 326,330 ----
  }
  
! bool aedXmlFile::parseRadioButtonGroup(TiXmlElement * element, aedWidget * parent)
  {
  	aedRect Position = safeExtractPosition(element);
***************
*** 359,363 ****
  }
  
! bool aedXmlFile::parseListBox(TiXmlElement * element, aedWindow * parent)
  {
  	aedRect Position = safeExtractPosition(element);
--- 360,364 ----
  }
  
! bool aedXmlFile::parseListBox(TiXmlElement * element, aedWidget * parent)
  {
  	aedRect Position = safeExtractPosition(element);
***************
*** 405,409 ****
  }
  
! bool aedXmlFile::parseSpinner(TiXmlElement * element, aedWindow * parent)
  {
  	aedRect Position = safeExtractPosition(element);
--- 406,410 ----
  }
  
! bool aedXmlFile::parseSpinner(TiXmlElement * element, aedWidget * parent)
  {
  	aedRect Position = safeExtractPosition(element);

Index: aedWindow.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedWindow.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** aedWindow.cpp	7 Oct 2003 01:19:36 -0000	1.62
--- aedWindow.cpp	25 Oct 2003 00:05:18 -0000	1.63
***************
*** 1,819 ****
! #include <stack>
! #include "aedWindow.h"
! #include "aedUpdateManager.h"
! #include "aedApp.h"
! #include "drawlibs.h"
! #include "rint.h"
! 
! // flags used in findChildAtCoord()
! enum { NO_STATIC = 0x01 };
! 
[...990 lines suppressed...]
  {
! 	aedButton * TheButton = reinterpret_cast < aedButton * > (caller);
! 	aedWindow * TheWindow = reinterpret_cast < aedWindow * > (TheButton->getUserData());
  
! 	if (TheWindow != NULL)
! 	{
! 		TheWindow->Maximize();
! 	}
  }
  
! void __aedInternal__WindowMinButtonHandler(void * caller, void * data)
  {
! 	aedButton * TheButton = reinterpret_cast < aedButton * > (caller);
! 	aedWindow * TheWindow = reinterpret_cast < aedWindow * > (TheButton->getUserData());
  
! 	if (TheWindow != NULL)
! 	{
! 		TheWindow->Minimize();
! 	}
  }

Index: aedTheme.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedTheme.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** aedTheme.cpp	4 Oct 2003 12:40:56 -0000	1.20
--- aedTheme.cpp	25 Oct 2003 00:05:18 -0000	1.21
***************
*** 325,329 ****
  
  void
! aedTheme::drawBox(aedWindow * widget, SDL_Surface * screen)
  {
      SDL_Rect rect;
--- 325,329 ----
  
  void
! aedTheme::drawBox(aedWidget * widget, SDL_Surface * screen)
  {
      SDL_Rect rect;
***************
*** 351,355 ****
  
  void
! aedTheme::drawBorder(aedWindow * widget, SDL_Surface * screen)
  {
      Uint16 maxWidth = screen->w - 1;
--- 351,355 ----
  
  void
! aedTheme::drawBorder(aedWidget * widget, SDL_Surface * screen)
  {
      Uint16 maxWidth = screen->w - 1;

Index: aedTextBox.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedTextBox.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** aedTextBox.cpp	23 Sep 2003 14:41:28 -0000	1.28
--- aedTextBox.cpp	25 Oct 2003 00:05:18 -0000	1.29
***************
*** 83,87 ****
  
  int
! aedTextBox::wm_mousemove(Uint16 x, Uint16 y)
  {
  	if (m_Selecting == true)
--- 83,87 ----
  
  int
! aedTextBox::wm_mousemove(Uint16 x, Uint16 y, Uint16 dx, Uint16 dy)
  {
  	if (m_Selecting == true)
***************
*** 114,118 ****
      }
  
!     aedWindow::wm_keydown(event);
  
      if(key == SDLK_TAB || key == SDLK_RETURN || key == SDLK_ESCAPE)
--- 114,118 ----
      }
  
!     aedWidget::wm_keydown(event);
  
      if(key == SDLK_TAB || key == SDLK_RETURN || key == SDLK_ESCAPE)

Index: aedSpinner.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedSpinner.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** aedSpinner.cpp	8 Sep 2003 19:55:50 -0000	1.4
--- aedSpinner.cpp	25 Oct 2003 00:05:18 -0000	1.5
***************
*** 10,16 ****
  
  void
! aedSpinner::create(aedWindow * parent, aedRect pos, std::string caption)
  {
!     aedWindow::create(parent, pos, caption);
      m_ButtonUp.setButtonType(SQUARE);
      m_ButtonDown.setButtonType(SQUARE);
--- 10,16 ----
  
  void
! aedSpinner::create(aedWidget * parent, aedRect pos, std::string caption)
  {
!     aedWidget::create(parent, pos, caption);
      m_ButtonUp.setButtonType(SQUARE);
      m_ButtonDown.setButtonType(SQUARE);

Index: aedSizer.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedSizer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** aedSizer.cpp	19 Oct 2003 16:47:11 -0000	1.1
--- aedSizer.cpp	25 Oct 2003 00:05:18 -0000	1.2
***************
*** 14,18 ****
  
  aedSizer::
! aedSizer(aedWindow *parent)
  {
  	m_Parent	= parent;
--- 14,18 ----
  
  aedSizer::
! aedSizer(aedWidget *parent)
  {
  	m_Parent	= parent;
***************
*** 21,25 ****
  void
  aedSizer::
! addWidget(aedWindow *widget)
  {
  	m_Widgets.push_back(widget);
--- 21,25 ----
  void
  aedSizer::
! addWidget(aedWidget *widget)
  {
  	m_Widgets.push_back(widget);

Index: aedScrollBar.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedScrollBar.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** aedScrollBar.cpp	8 Sep 2003 19:55:50 -0000	1.23
--- aedScrollBar.cpp	25 Oct 2003 00:05:18 -0000	1.24
***************
*** 9,16 ****
  
  void
! aedScrollBar::create(aedWindow * parent, aedRect pos,
                       std::string caption)
  {
!     aedWindow::create(parent, pos, caption);
  
      if(getOrientation() == AED_VERTICAL)
--- 9,16 ----
  
  void
! aedScrollBar::create(aedWidget * parent, aedRect pos,
                       std::string caption)
  {
!     aedWidget::create(parent, pos, caption);
  
      if(getOrientation() == AED_VERTICAL)
***************
*** 156,160 ****
  aedScrollBar::buttonUpClicked(void *caller, void *data)
  {
!     aedWindow *btn = (aedWindow *) caller;
      aedScrollBar *scroll = dynamic_cast < aedScrollBar * >(btn->getParent());
  
--- 156,160 ----
  aedScrollBar::buttonUpClicked(void *caller, void *data)
  {
!     aedWidget *btn = (aedWidget *) caller;
      aedScrollBar *scroll = dynamic_cast < aedScrollBar * >(btn->getParent());
  
***************
*** 165,169 ****
  aedScrollBar::buttonDownClicked(void *caller, void *data)
  {
!     aedWindow *btn = (aedWindow *) caller;
      aedScrollBar *scroll = dynamic_cast < aedScrollBar * >(btn->getParent());
  
--- 165,169 ----
  aedScrollBar::buttonDownClicked(void *caller, void *data)
  {
!     aedWidget *btn = (aedWidget *) caller;
      aedScrollBar *scroll = dynamic_cast < aedScrollBar * >(btn->getParent());
  

Index: aedMenuBar.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedMenuBar.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** aedMenuBar.cpp	17 Sep 2003 18:50:55 -0000	1.2
--- aedMenuBar.cpp	25 Oct 2003 00:05:18 -0000	1.3
***************
*** 107,111 ****
  
  int
! aedMenuBar::wm_mousemove(Uint16 x, Uint16 y)
  {
      int i;
--- 107,111 ----
  
  int
! aedMenuBar::wm_mousemove(Uint16 x, Uint16 y, Uint16 dx, Uint16 dy)
  {
      int i;

Index: aedMenu.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedMenu.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** aedMenu.cpp	7 Oct 2003 01:19:36 -0000	1.4
--- aedMenu.cpp	25 Oct 2003 00:05:18 -0000	1.5
***************
*** 74,78 ****
  
  int
! aedMenu::wm_mousemove(Uint16 x, Uint16 y)
  {
      int i = getIndexFromPixel(x, y);
--- 74,78 ----
  
  int
! aedMenu::wm_mousemove(Uint16 x, Uint16 y, Uint16 dx, Uint16 dy)
  {
      int i = getIndexFromPixel(x, y);

Index: aedCheckBox.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedCheckBox.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** aedCheckBox.cpp	17 Sep 2003 14:51:36 -0000	1.11
--- aedCheckBox.cpp	25 Oct 2003 00:05:18 -0000	1.12
***************
*** 1,3 ****
! #include "aedWindow.h"
  #include "aedCheckBox.h"
  
--- 1,3 ----
! #include "aedWidget.h"
  #include "aedCheckBox.h"
  

Index: aedButton.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedButton.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** aedButton.cpp	17 Sep 2003 14:51:35 -0000	1.20
--- aedButton.cpp	25 Oct 2003 00:05:18 -0000	1.21
***************
*** 30,34 ****
  aedButton::wm_keydown(aedKeyEvent & event)
  {
!     aedWindow::wm_keydown(event);
  
      if(event.sym == SDLK_RETURN || event.sym == SDLK_SPACE)
--- 30,34 ----
  aedButton::wm_keydown(aedKeyEvent & event)
  {
!     aedWidget::wm_keydown(event);
  
      if(event.sym == SDLK_RETURN || event.sym == SDLK_SPACE)

Index: aedBoxSizer.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedBoxSizer.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** aedBoxSizer.cpp	20 Oct 2003 19:23:17 -0000	1.2
--- aedBoxSizer.cpp	25 Oct 2003 00:05:18 -0000	1.3
***************
*** 3,7 ****
  
  aedBoxSizer::
! aedBoxSizer(aedWindow *parent, boxType type)
  {
  	m_Parent	= parent;
--- 3,7 ----
  
  aedBoxSizer::
! aedBoxSizer(aedWidget *parent, boxType type)
  {
  	m_Parent	= parent;

Index: aedApp.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedApp.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** aedApp.cpp	17 Sep 2003 18:50:55 -0000	1.25
--- aedApp.cpp	25 Oct 2003 00:05:18 -0000	1.26
***************
*** 10,14 ****
  #include "aedLog.h"
  #include "aedUpdateManager.h"
! #include "aedWindow.h"
  #include "SDL_ttf.h"
  
--- 10,14 ----
  #include "aedLog.h"
  #include "aedUpdateManager.h"
! #include "aedWidget.h"
  #include "SDL_ttf.h"
  
***************
*** 116,120 ****
  }
  
! void aedApp::setFocusWindow(aedWindow *win)
  {
      if(m_FocusWindow != NULL && win != NULL && m_FocusWindow != m_Root)
--- 116,120 ----
  }
  
! void aedApp::setFocusWindow(aedWidget *win)
  {
      if(m_FocusWindow != NULL && win != NULL && m_FocusWindow != m_Root)