moved wxWindow::GetBestSize implementation into DoGetBestSize to make it easier to...

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

diff --git a/src/gtk1/popupwin.cpp b/src/gtk1/popupwin.cpp
index 236a69d036ba98a5372904522f13abfce28f1f9b..58471540180d2841beda5846cf6bc088c978f856 100644 (file)
--- a/src/gtk1/popupwin.cpp
+++ b/src/gtk1/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
 


@@ -117,7 +118,7 @@ gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win )
 
 /* Callback for wxFrame. This very strange beast has to be used because
  * C++ has no virtual methods in a constructor. We have to emulate a
 
 /* Callback for wxFrame. This very strange beast has to be used because
  * C++ has no virtual methods in a constructor. We have to emulate a

- * virtual function here as wxWindows requires different ways to insert
+ * virtual function here as wxWidgets requires different ways to insert

  * a child in container classes. */
 
 static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* child )
  * a child in container classes. */
 
 static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* child )


@@ -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 )


@@ -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;
 }