[aedGUI-cvs] aedGUI/src aedApp.cpp,1.13,1.14 aedTheme.cpp,1.12,1.13

[<sr...@us...>]

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

Modified Files:
	aedApp.cpp aedTheme.cpp 
Log Message:

Small updates. Removed aedColor::getSDLColor (not needed since we have
operator SDL_Color ()).


Index: aedApp.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedApp.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** aedApp.cpp	29 Aug 2003 22:00:12 -0000	1.13
--- aedApp.cpp	30 Aug 2003 14:09:16 -0000	1.14
***************
*** 96,100 ****
      pLog->notice("Themes used (including the default one): %d\n",
                   m_Themes.size());
!     m_Themes.erase(m_Themes.begin(), m_Themes.end());
  
      for(i = 0; i < m_Fonts.size(); i++)
--- 96,100 ----
      pLog->notice("Themes used (including the default one): %d\n",
                   m_Themes.size());
!     m_Themes.clear();
  
      for(i = 0; i < m_Fonts.size(); i++)
***************
*** 118,123 ****
                   m_Fonts.size(), nmfe, m_MemFonts.size());
  
!     m_Fonts.erase(m_Fonts.begin(), m_Fonts.end());
!     m_MemFonts.erase(m_MemFonts.begin(), m_MemFonts.end());
  
      TTF_Quit();
--- 118,123 ----
                   m_Fonts.size(), nmfe, m_MemFonts.size());
  
!     m_Fonts.clear();
!     m_MemFonts.clear();
  
      TTF_Quit();

Index: aedTheme.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedTheme.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** aedTheme.cpp	24 Aug 2003 22:59:56 -0000	1.12
--- aedTheme.cpp	30 Aug 2003 14:09:16 -0000	1.13
***************
*** 132,137 ****
      Uint16 maxHeight = screen->h - 1;
      Uint16 maxWidth = screen->w - 1;
!     SDL_Color c1 = colorButtonPushed1.getSDLColor();
!     SDL_Color c2 = colorButtonPushed2.getSDLColor();
      SDL_Rect rect = { 1, 1, screen->w - 2, screen->h - 2 };
  
--- 132,137 ----
      Uint16 maxHeight = screen->h - 1;
      Uint16 maxWidth = screen->w - 1;
!     SDL_Color c1 = colorButtonPushed1;
!     SDL_Color c2 = colorButtonPushed2;
      SDL_Rect rect = { 1, 1, screen->w - 2, screen->h - 2 };
  
***************
*** 170,175 ****
      Uint16 maxHeight = screen->h - 1;
      Uint16 maxWidth = screen->w - 1;
!     SDL_Color c1 = colorButtonPushed1.getSDLColor();
!     SDL_Color c2 = colorButtonPushed2.getSDLColor();
      SDL_Rect rect = { 1, 1, screen->w - 2, screen->h - 2 };
  
--- 170,175 ----
      Uint16 maxHeight = screen->h - 1;
      Uint16 maxWidth = screen->w - 1;
!     SDL_Color c1 = colorButtonPushed1;
!     SDL_Color c2 = colorButtonPushed2;
      SDL_Rect rect = { 1, 1, screen->w - 2, screen->h - 2 };
  
***************
*** 453,468 ****
      if(btnDown)
      {
!         c1 = colorButtonPushed1.getSDLColor();
!         c2 = colorButtonPushed2.getSDLColor();
      }
      else if(!widget->isMouseOver())
      {
!         c1 = colorButtonNormal1.getSDLColor();
!         c2 = colorButtonNormal2.getSDLColor();
      }
      else
      {
!         c1 = colorButtonOver1.getSDLColor();
!         c2 = colorButtonOver2.getSDLColor();
      }
  
--- 453,468 ----
      if(btnDown)
      {
!         c1 = colorButtonPushed1;
!         c2 = colorButtonPushed2;
      }
      else if(!widget->isMouseOver())
      {
!         c1 = colorButtonNormal1;
!         c2 = colorButtonNormal2;
      }
      else
      {
!         c1 = colorButtonOver1;
!         c2 = colorButtonOver2;
      }
  
***************
*** 482,497 ****
      if(btnDown)
      {
!         c1 = colorButtonPushed1.getSDLColor();
!         c2 = colorButtonPushed2.getSDLColor();
      }
      else if(!widget->isMouseOver())
      {
!         c1 = colorButtonNormal1.getSDLColor();
!         c2 = colorButtonNormal2.getSDLColor();
      }
      else
      {
!         c1 = colorButtonOver1.getSDLColor();
!         c2 = colorButtonOver2.getSDLColor();
      }
  
--- 482,497 ----
      if(btnDown)
      {
!         c1 = colorButtonPushed1;
!         c2 = colorButtonPushed2;
      }
      else if(!widget->isMouseOver())
      {
!         c1 = colorButtonNormal1;
!         c2 = colorButtonNormal2;
      }
      else
      {
!         c1 = colorButtonOver1;
!         c2 = colorButtonOver2;
      }