allow wxPopupWindow get the key events (patch 713269)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index 59deba50a4043b321c2e1b0c683faa100a17e1d6..37ef8ee9d78fd1c0c3e31cd024c698bad2982001 100644 (file)
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -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();

diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index 236a69d036ba98a5372904522f13abfce28f1f9b..ace707144e59cf4633af88e28f8ec61afc05b5e9 100644 (file)
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -151,8 +151,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
 
 wxPopupWindow::~wxPopupWindow()
 {
 
 wxPopupWindow::~wxPopupWindow()
 {

-    if (GTK_WIDGET_HAS_GRAB(m_widget))
-        gtk_grab_remove( m_widget );

 }
 
 bool wxPopupWindow::Create( wxWindow *parent, int style )
 }
 
 bool wxPopupWindow::Create( wxWindow *parent, int style )


@@ -349,14 +347,8 @@ bool wxPopupWindow::Show( bool show )
         GtkOnSize( m_x, m_y, m_width, m_height );
     }
     
         GtkOnSize( m_x, m_y, m_width, m_height );
     }
     

-    if (!show)
-        gtk_grab_remove( m_widget );
-    

     bool ret = wxWindow::Show( show );
     
     bool ret = wxWindow::Show( show );
     

-    if (show)
-        gtk_grab_add( m_widget );
-    

     return ret;
 }
 
     return ret;
 }
 

diff --git a/src/gtk1/popupwin.cpp b/src/gtk1/popupwin.cpp
index 236a69d036ba98a5372904522f13abfce28f1f9b..ace707144e59cf4633af88e28f8ec61afc05b5e9 100644 (file)
--- a/src/gtk1/popupwin.cpp
+++ b/src/gtk1/popupwin.cpp
@@ -151,8 +151,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
 
 wxPopupWindow::~wxPopupWindow()
 {
 
 wxPopupWindow::~wxPopupWindow()
 {

-    if (GTK_WIDGET_HAS_GRAB(m_widget))
-        gtk_grab_remove( m_widget );

 }
 
 bool wxPopupWindow::Create( wxWindow *parent, int style )
 }
 
 bool wxPopupWindow::Create( wxWindow *parent, int style )


@@ -349,14 +347,8 @@ bool wxPopupWindow::Show( bool show )
         GtkOnSize( m_x, m_y, m_width, m_height );
     }
     
         GtkOnSize( m_x, m_y, m_width, m_height );
     }
     

-    if (!show)
-        gtk_grab_remove( m_widget );
-    

     bool ret = wxWindow::Show( show );
     
     bool ret = wxWindow::Show( show );
     

-    if (show)
-        gtk_grab_add( m_widget );
-    

     return ret;
 }
 
     return ret;
 }