showing a bevel button for a multiline label (is not multline on the OS level, but...

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

diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index 59deba50a4043b321c2e1b0c683faa100a17e1d6..17093b2d9e5d71b8f2f7fe7b2ce9ac9f03eb16fd 100644 (file)
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "tipwin.h"
 #endif
 
     #pragma implementation "tipwin.h"
 #endif
 


@@ -31,7 +31,9 @@
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
 #endif // WX_PRECOMP
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
 #endif // WX_PRECOMP

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

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


@@ -157,6 +159,10 @@ wxTipWindow::wxTipWindow(wxWindow *parent,
 #if wxUSE_POPUPWIN
     Position(wxPoint(x, y), wxSize(0, 0));
     Popup(m_view);
 #if wxUSE_POPUPWIN
     Position(wxPoint(x, y), wxSize(0, 0));
     Popup(m_view);

+    #ifdef __WXGTK__
+        if (!GTK_WIDGET_HAS_GRAB(m_widget))
+            gtk_grab_add( m_widget );
+    #endif   

 #else
     Move(x, y);
     Show(TRUE);
 #else
     Move(x, y);
     Show(TRUE);


@@ -169,6 +175,12 @@ wxTipWindow::~wxTipWindow()
     {
         *m_windowPtr = NULL;
     }
     {
         *m_windowPtr = NULL;
     }

+    #ifdef wxUSE_POPUPWIN
+        #ifdef __WXGTK__
+            if (GTK_WIDGET_HAS_GRAB(m_widget))
+                gtk_grab_remove( m_widget );
+        #endif
+    #endif

 }
 
 void wxTipWindow::OnMouseClick(wxMouseEvent& WXUNUSED(event))
 }
 
 void wxTipWindow::OnMouseClick(wxMouseEvent& WXUNUSED(event))


@@ -218,6 +230,10 @@ void wxTipWindow::Close()
 
 #if wxUSE_POPUPWIN
     Show(FALSE);
 
 #if wxUSE_POPUPWIN
     Show(FALSE);

+    #ifdef __WXGTK__
+        if (GTK_WIDGET_HAS_GRAB(m_widget))
+            gtk_grab_remove( m_widget );
+    #endif   

     Destroy();
 #else
     wxFrame::Close();
     Destroy();
 #else
     wxFrame::Close();