X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22a35096a0a9c3fe4d3d32b8d68a361126ef9677..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/generic/tipwin.cpp

diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index 12087b7b4b..b50fb47a96 100644
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -34,10 +34,6 @@
     #include "wx/settings.h"
 #endif // WX_PRECOMP
 
-#ifdef __WXGTK__
-    #include <gtk/gtk.h>
-#endif
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -75,7 +71,7 @@ private:
 #endif // !wxUSE_POPUPWIN
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxTipWindowView)
+    wxDECLARE_NO_COPY_CLASS(wxTipWindowView);
 };
 
 // ============================================================================
@@ -157,8 +153,7 @@ wxTipWindow::wxTipWindow(wxWindow *parent,
     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);
@@ -172,10 +167,10 @@ wxTipWindow::~wxTipWindow()
     {
         *m_windowPtr = NULL;
     }
-    #ifdef wxUSE_POPUPWIN
+    #if 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
 }
@@ -228,8 +223,8 @@ void wxTipWindow::Close()
 #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
@@ -272,7 +267,7 @@ void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
     bool breakLine = false;
     for ( const wxChar *p = text.c_str(); ; p++ )
     {
-        if ( *p == _T('\n') || *p == _T('\0') )
+        if ( *p == wxT('\n') || *p == wxT('\0') )
         {
             dc.GetTextExtent(current, &width, &height);
             if ( width > widthMax )
@@ -292,7 +287,7 @@ void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
             current.clear();
             breakLine = false;
         }
-        else if ( breakLine && (*p == _T(' ') || *p == _T('\t')) )
+        else if ( breakLine && (*p == wxT(' ') || *p == wxT('\t')) )
         {
             // word boundary - break the line here
             m_parent->m_textLines.Add(current);
@@ -331,8 +326,8 @@ void wxTipWindowView::OnPaint(wxPaintEvent& WXUNUSED(event))
     rect.height = size.y;
 
     // first filll the background
-    dc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
-    dc.SetPen( wxPen(GetForegroundColour(), 1, wxSOLID) );
+    dc.SetBrush(wxBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID));
+    dc.SetPen(wxPen(GetForegroundColour(), 1, wxPENSTYLE_SOLID));
     dc.DrawRectangle(rect);
 
     // and then draw the text line by line