remove unnecessary gtk_widget_show(m_widget) calls, PostCreation() takes care of...

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

diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index 641a9248eaf34e85fad15ca0ca89f552b4037b4b..17d0671e937373cb02059039715c29f8c35cab67 100644 (file)
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -46,7 +46,7 @@ static gint gtk_popup_button_press (GtkWidget *widget, GdkEvent *gdk_event, wxPo
         {
             if (child == widget)
                 return FALSE;
         {
             if (child == widget)
                 return FALSE;

-            child = child->parent;
+            child = gtk_widget_get_parent(child);

         }
     }
 
         }
     }
 


@@ -73,14 +73,6 @@ bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED
 }
 }
 
 }
 }
 

-void wxPopupWindow::AddChildGTK(wxWindowGTK* child)
-{
-    gtk_widget_set_size_request(
-        child->m_widget, child->m_width, child->m_height);
-    gtk_fixed_put(
-        GTK_FIXED(m_wxwindow), child->m_widget, child->m_x, child->m_y);
-}
-

 //-----------------------------------------------------------------------------
 // wxPopupWindow
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxPopupWindow
 //-----------------------------------------------------------------------------


@@ -124,7 +116,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
         if (!gtk_check_version(2,10,0))
             gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)), GTK_WINDOW (m_widget));
 #endif
         if (!gtk_check_version(2,10,0))
             gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)), GTK_WINDOW (m_widget));
 #endif

-    
+

         gtk_window_set_transient_for (GTK_WINDOW (m_widget), GTK_WINDOW (toplevel));
     }
     gtk_window_set_resizable (GTK_WINDOW (m_widget), FALSE);
         gtk_window_set_transient_for (GTK_WINDOW (m_widget), GTK_WINDOW (toplevel));
     }
     gtk_window_set_resizable (GTK_WINDOW (m_widget), FALSE);


@@ -210,7 +202,7 @@ void wxPopupWindow::SetFocus()
             return;
         }
     }
             return;
         }
     }

-    
+

     wxPopupWindowBase::SetFocus();
 }
 
     wxPopupWindowBase::SetFocus();
 }