[Wgui-cvs] wgui/src wg_button.cpp,1.33,1.34 wg_view.cpp,1.36,1.37

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

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

Modified Files:
	wg_button.cpp wg_view.cpp 
Log Message:
Draw architecture changes.

Index: wg_view.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/src/wg_view.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** wg_view.cpp	25 Jun 2004 19:37:51 -0000	1.36
--- wg_view.cpp	28 Jun 2004 23:03:35 -0000	1.37
***************
*** 24,27 ****
--- 24,28 ----
  
  #include "wgui_include_config.h"
+ #include "wutil_debug.h"
  #include "wg_view.h"
  #include "wg_error.h"
***************
*** 176,179 ****
--- 177,181 ----
  				if (!m_pFloatingWindow || !m_pFloatingWindow->OnMouseButtonDown(pMouseMessage->Point, pMouseMessage->Button))
  				{
+ //					wUtil::Trace(std::string("Mouse Click at: ") + stdex::itoa(pMouseMessage->Point.XPos()) + ", " + stdex::itoa(pMouseMessage->Point.YPos()));
  					OnMouseButtonDown(pMouseMessage->Point, pMouseMessage->Button);
  				}

Index: wg_button.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/src/wg_button.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** wg_button.cpp	25 Jun 2004 19:37:51 -0000	1.33
--- wg_button.cpp	28 Jun 2004 23:03:35 -0000	1.34
***************
*** 24,27 ****
--- 24,28 ----
  
  #include "wgui_include_config.h"
+ #include "wutil_debug.h"
  #include "wg_button.h"
  #include "wg_application.h"
***************
*** 120,126 ****
  	bool bResult = false;
  
  
   	if (! CWindow::OnMouseButtonDown(Point, Button) && m_bVisible && (m_eButtonState == UP) &&
! 		(m_MouseButton == Button) && (m_WindowRect.SizeRect().HitTest(ViewToWindow(Point)) == CRect::RELPOS_INSIDE))
  	{
  		SetButtonState(DOWN);
--- 121,128 ----
  	bool bResult = false;
  
+ //	wUtil::Trace(std::string("[Button - ") + m_sWindowText + "] Mouse Click at: " + stdex::itoa(ViewToWindow(Point).XPos()) + ", " + stdex::itoa(ViewToWindow(Point).YPos()));
  
   	if (! CWindow::OnMouseButtonDown(Point, Button) && m_bVisible && (m_eButtonState == UP) &&
! 		(m_WindowRect.SizeRect().HitTest(ViewToWindow(Point)) == CRect::RELPOS_INSIDE))
  	{
  		SetButtonState(DOWN);