[Wgui-cvs] wgui/src wg_tooltip.cpp,1.24,1.25

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

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

Modified Files:
	wg_tooltip.cpp 
Log Message:
Tooltips will no longer appear if the window the mouse is in the floating window

Index: wg_tooltip.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/src/wg_tooltip.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** wg_tooltip.cpp	16 Jul 2004 16:41:36 -0000	1.24
--- wg_tooltip.cpp	19 Jul 2004 21:15:57 -0000	1.25
***************
*** 23,26 ****
--- 23,27 ----
  
  #include "wgui_include_config.h"
+ #include "wg_view.h"
  #include "wg_tooltip.h"
  
***************
*** 145,150 ****
  					HideTip();
  				}
  				if (m_pParentWindow->GetWindowRect().SizeRect().HitTest(
! 					m_pParentWindow->ViewToWindow(m_LastMousePosition)) == CRect::RELPOS_INSIDE)
  				{
  					m_pTimer->StartTimer(1000);
--- 146,159 ----
  					HideTip();
  				}
+ 				CView* pView = GetView();
+ 				int eFloatingWindowHit = CRect::RELPOS_INVALID;
+ 				if (pView && pView->GetFloatingWindow())
+ 				{
+ 					eFloatingWindowHit = pView->GetFloatingWindow()->GetWindowRect().SizeRect().HitTest(
+ 						pView->GetFloatingWindow()->ViewToWindow(pMouseMessage->Point));
+ 				}
  				if (m_pParentWindow->GetWindowRect().SizeRect().HitTest(
! 					m_pParentWindow->ViewToWindow(m_LastMousePosition)) == CRect::RELPOS_INSIDE
! 					&& eFloatingWindowHit != CRect::RELPOS_INSIDE)
  				{
  					m_pTimer->StartTimer(1000);