replace @b Note with @note; replace '' with "

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

diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index 9749b8a785c3b4eda3cf99910e8296a978e6d1d9..daea96f6696f90d2c8df0bf9a412d3e1b18199e9 100644 (file)
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -17,25 +17,22 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-// For compilers that support precompilatixon, includes "wx/wx.h".
+// For compilers that support precompilation, includes "wx/wx.h".

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

+#if wxUSE_TIPWINDOW
+
+#include "wx/tipwin.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"

+    #include "wx/timer.h"
+    #include "wx/settings.h"

 #endif // WX_PRECOMP
 #endif // WX_PRECOMP

-#ifdef __WXGTK__
-    #include <gtk/gtk.h>
-#endif
-#include "wx/tipwin.h"
-
-#if wxUSE_TIPWINDOW
-
-#include "wx/timer.h"
-#include "wx/settings.h"

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


@@ -156,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);


@@ -173,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
 }


@@ -227,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


@@ -330,8 +326,8 @@ void wxTipWindowView::OnPaint(wxPaintEvent& WXUNUSED(event))
     rect.height = size.y;
 
     // first filll the background
     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
     dc.DrawRectangle(rect);
 
     // and then draw the text line by line


@@ -361,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();