[Gcblue-commits] gcb_wx/src/graphics tcWindow.cpp,1.4,1.5

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/src/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23738/src/graphics

Modified Files:
	tcWindow.cpp 
Log Message:


Index: tcWindow.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcWindow.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcWindow.cpp	19 Jun 2004 22:00:28 -0000	1.4
--- tcWindow.cpp	24 Jun 2004 21:35:40 -0000	1.5
***************
*** 210,213 ****
--- 210,214 ----
  }
  
+ 
  /** 
  * @return pointer to WCHAR array (string) with IMAGE_PATH prepended,
***************
*** 516,519 ****
--- 517,548 ----
  }
  
+ /**
+ * 
+ */
+ void tcWindow::Maximize()
+ {
+ 	if (!IsWindowMinimized()) return; // already maximized
+ 
+ 	wxWindow::SetSize(normalPosition);
+ }
+ 
+ /**
+ *
+ */
+ void tcWindow::Minimize()
+ {
+ 	if (IsWindowMinimized()) return; // already minimized
+ 
+ 	wxWindow::SetSize(iconPosition);
+ }
+ 
+ /**
+ * Called IsWindowMinimized to avoid possible conflict
+ * with wxWindows::IsMinimized
+ */
+ bool tcWindow::IsWindowMinimized() const
+ {
+ 	return mnWidth == iconSize;
+ }
  
  bool tcWindow::IsSurfaceModified() 
***************
*** 666,670 ****
          const wxString& name, tcWindow *sharedSurfaceHost) :
          wxWindow(parent, -1, pos, size, wxTRANSPARENT_WINDOW | wxNO_FULL_REPAINT_ON_RESIZE, name),   //| wxNO_FULL_REPAINT_ON_RESIZE |wxCLIP_CHILDREN
!         mnHeight(size.GetHeight()), mnWidth(size.GetWidth())
  {
      wxWindow::SetBackgroundColour(*wxBLACK);
--- 695,701 ----
          const wxString& name, tcWindow *sharedSurfaceHost) :
          wxWindow(parent, -1, pos, size, wxTRANSPARENT_WINDOW | wxNO_FULL_REPAINT_ON_RESIZE, name),   //| wxNO_FULL_REPAINT_ON_RESIZE |wxCLIP_CHILDREN
!         mnHeight(size.GetHeight()), mnWidth(size.GetWidth()),
! 		iconSize(32),
! 		normalPosition(pos, size)
  {
      wxWindow::SetBackgroundColour(*wxBLACK);
***************
*** 677,681 ****
      mrectWindow.top = pos.y;
      mrectWindow.bottom = pos.y + size.GetHeight();
!     
      mpiBackground = NULL;
      mbFrozen = false;
--- 708,720 ----
      mrectWindow.top = pos.y;
      mrectWindow.bottom = pos.y + size.GetHeight();
! 	
! 	/* need to update to create default icon position as a 
! 	** function of initial window position
! 	*/
! 	iconPosition = wxRect(normalPosition.GetRight() - iconSize, 
! 		                  normalPosition.GetBottom() - iconSize,
! 						  iconSize,
! 						  iconSize);
! 
      mpiBackground = NULL;
      mbFrozen = false;