gtk_widget_destroy does not unref the widget unless it's a TLW or in a

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

diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index bad479785abf250205996060d70b309e6fea87f0..1aa9e22b6b4386a0472fad5f8851e5c32609aa59 100644 (file)
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -110,7 +110,7 @@ gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win )
  * virtual function here as wxWidgets requires different ways to insert
  * a child in container classes. */
 
  * virtual function here as wxWidgets requires different ways to insert
  * a child in container classes. */
 

-static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* child )
+static void wxInsertChildInPopupWin(wxWindow* parent, wxWindow* child)

 {
     gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
                    child->m_widget,
 {
     gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
                    child->m_widget,


@@ -143,6 +143,8 @@ wxPopupWindow::~wxPopupWindow()
 
 bool wxPopupWindow::Create( wxWindow *parent, int style )
 {
 
 bool wxPopupWindow::Create( wxWindow *parent, int style )
 {

+    m_sizeSet = false;
+

     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("popup") ))
     {
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("popup") ))
     {


@@ -156,7 +158,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     // All dialogs should really have this style
     m_windowStyle |= wxTAB_TRAVERSAL;
 
     // All dialogs should really have this style
     m_windowStyle |= wxTAB_TRAVERSAL;
 

-    m_insertCallback = (wxInsertChildFunction) wxInsertChildInDialog;
+    m_insertCallback = wxInsertChildInPopupWin;

 
     m_widget = gtk_window_new( GTK_WINDOW_POPUP );
 
 
     m_widget = gtk_window_new( GTK_WINDOW_POPUP );