[Wgui-cvs] wgui/includes wg_window.h,1.37,1.38

[Rob W. <gre...@us...>]

Update of /cvsroot/wgui/wgui/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8505/includes

Modified Files:
	wg_window.h 
Log Message:
Draw architecture changes.

Index: wg_window.h
===================================================================
RCS file: /cvsroot/wgui/wgui/includes/wg_window.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** wg_window.h	25 Jun 2004 13:34:15 -0000	1.37
--- wg_window.h	25 Jun 2004 19:37:50 -0000	1.38
***************
*** 122,134 ****
  	virtual SDL_Surface* GetSDLSurface(void) { return m_pSDLSurface; }
  
! 	//! Translate the given CRect into screen coordinates
  	//! \param Rect A CRect in client coordinates
! 	// TODO: fix
! 	virtual CRect ClientToScreen(const CRect& Rect) const { return Rect + GetClientRect().TopLeft(); }
  
! 	//! Translate the given CPoint into screen coordinates
  	//! \param Point A CPoint in client coordinates
! 	// TODO: fix
! 	virtual CPoint ClientToScreen(const CPoint& Point) const { return Point + GetClientRect().TopLeft(); }
  
  	//! Set the WindowText of the control
--- 122,140 ----
  	virtual SDL_Surface* GetSDLSurface(void) { return m_pSDLSurface; }
  
! 	//! Translate the given CRect into view coordinates
  	//! \param Rect A CRect in client coordinates
! 	virtual CRect ClientToView(const CRect& Rect) const;
  
! 	//! Translate the given CPoint into view coordinates
  	//! \param Point A CPoint in client coordinates
! 	virtual CPoint ClientToView(const CPoint& Point) const;
! 
! 	//! Translate the given CRect from view coordinates, to the window's coordinates
! 	//! \param Rect A CRect in view coordinates
! 	virtual CRect ViewToWindow(const CRect& Rect) const;
! 
! 	//! Translate the given CPoint from view coordinates, to the window's coordinates
! 	//! \param Point A CPoint in view coordinates
! 	virtual CPoint ViewToWindow(const CPoint& Point) const;
  
  	//! Set the WindowText of the control
***************
*** 210,216 ****
  	bool m_bVisible;
  
- 	//! Indicates if the control has been drawn yet or not
- 	mutable bool m_bDrawCompleted;
- 
  private:
  	void operator=(CWindow) { }  //!< The assignment operator is not allowed for CWindow objects
--- 216,219 ----