Don't needlessly indirect through NSNotificationCenter.

[wxWidgets.git] / src / generic / tipwin.cpp

diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index 36dd8b550a987929eefb378f933cf769c67c179e..c64fa5a569729e6077cf05a085a238c422aafe3f 100644 (file)
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -34,10 +34,6 @@
     #include "wx/settings.h"
 #endif // WX_PRECOMP
 
     #include "wx/settings.h"
 #endif // WX_PRECOMP
 

-#ifdef __WXGTK__
-    #include <gtk/gtk.h>
-#endif
-

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -157,8 +153,7 @@ wxTipWindow::wxTipWindow(wxWindow *parent,
     Position(wxPoint(x, y), wxSize(0,0));
     Popup(m_view);
     #ifdef __WXGTK__
     Position(wxPoint(x, y), wxSize(0,0));
     Popup(m_view);
     #ifdef __WXGTK__

-        if (!GTK_WIDGET_HAS_GRAB(m_widget))
-            gtk_grab_add( m_widget );
+        m_view->CaptureMouse();

     #endif
 #else
     Move(x, y);
     #endif
 #else
     Move(x, y);


@@ -174,8 +169,8 @@ wxTipWindow::~wxTipWindow()
     }
     #ifdef wxUSE_POPUPWIN
         #ifdef __WXGTK__
     }
     #ifdef wxUSE_POPUPWIN
         #ifdef __WXGTK__

-            if (GTK_WIDGET_HAS_GRAB(m_widget))
-                gtk_grab_remove( m_widget );
+            if ( m_view->HasCapture() )
+                m_view->ReleaseMouse();

         #endif
     #endif
 }
         #endif
     #endif
 }


@@ -228,8 +223,8 @@ void wxTipWindow::Close()
 #if wxUSE_POPUPWIN
     Show(false);
     #ifdef __WXGTK__
 #if wxUSE_POPUPWIN
     Show(false);
     #ifdef __WXGTK__

-        if (GTK_WIDGET_HAS_GRAB(m_widget))
-            gtk_grab_remove( m_widget );
+        if ( m_view->HasCapture() )
+            m_view->ReleaseMouse();

     #endif
     Destroy();
 #else
     #endif
     Destroy();
 #else


@@ -362,7 +357,7 @@ void wxTipWindowView::OnMouseMove(wxMouseEvent& event)
     const wxRect& rectBound = m_parent->m_rectBound;
 
     if ( rectBound.width &&
     const wxRect& rectBound = m_parent->m_rectBound;
 
     if ( rectBound.width &&

-            !rectBound.Inside(ClientToScreen(event.GetPosition())) )
+            !rectBound.Contains(ClientToScreen(event.GetPosition())) )

     {
         // mouse left the bounding rect, disappear
         m_parent->Close();
     {
         // mouse left the bounding rect, disappear
         m_parent->Close();