don't set resize mode to QUEUE, it seems to be wrong for a wxWindow in a native container

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

diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp
index 19909e87c6b94714ee2da552f0f16e40f7b7d2f2..d8d901817c34bc19cafb28c23b8197b5323b57ac 100644 (file)
--- a/src/gtk/win_gtk.cpp
+++ b/src/gtk/win_gtk.cpp
@@ -321,7 +321,6 @@ GtkWidget* wxPizza::New(long windowStyle)
         GDK_ENTER_NOTIFY_MASK |
         GDK_LEAVE_NOTIFY_MASK |
         GDK_FOCUS_CHANGE_MASK);
-    gtk_container_set_resize_mode(GTK_CONTAINER(widget), GTK_RESIZE_QUEUE);
     return widget;
 }
 

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 5a6d9f2b49cb610cc019fa509ade91b9b00a5de8..d1cf0511dbe26917c46d10ec8309e1337d4ae90d 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2245,7 +2245,6 @@ bool wxWindowGTK::Create( wxWindow *parent,
     else
     {
         m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
-        gtk_container_set_resize_mode(GTK_CONTAINER(m_widget), GTK_RESIZE_QUEUE);
 
         GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget);
 
@@ -2911,19 +2910,16 @@ bool wxWindowGTK::Show( bool show )
         return false;
     }
 
-    if (show)
+    if (show && m_showOnIdle)
     {
-        if (!m_showOnIdle)
-        {
-            gtk_widget_show( m_widget );
-            wxShowEvent eventShow(GetId(), show);
-            eventShow.SetEventObject(this);
-            HandleWindowEvent(eventShow);
-        }
+        // deferred
     }
     else
     {
-        gtk_widget_hide( m_widget );
+        if (show)
+            gtk_widget_show(m_widget);
+        else
+            gtk_widget_hide(m_widget);
         wxShowEvent eventShow(GetId(), show);
         eventShow.SetEventObject(this);
         HandleWindowEvent(eventShow);