A little clarification

[wxWidgets.git] / src / gtk / popupwin.cpp

diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index 923a68bbd1167a5b7861d2b6315acf4ec55dc6ab..4c6a9f8cbca8b894f65cd035f1833e94af534ea2 100644 (file)
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -7,11 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation "popupwin.h"
 #endif
 
 #pragma implementation "popupwin.h"
 #endif
 

-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_POPUPWIN
 
 
 #if wxUSE_POPUPWIN
 


@@ -151,8 +152,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 )


@@ -160,7 +159,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     m_needParent = FALSE;
 
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
     m_needParent = FALSE;
 
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||

-        !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, "popup" ))
+        !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("popup") ))

     {
         wxFAIL_MSG( wxT("wxPopupWindow creation failed") );
         return FALSE;
     {
         wxFAIL_MSG( wxT("wxPopupWindow creation failed") );
         return FALSE;


@@ -349,14 +348,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;
 }