From: Paul Cornett <paulcor@bullseye.com>
Date: Thu, 27 Aug 2009 07:08:12 +0000 (+0000)
Subject: small fix to last commit, only disable updating decor size if necessary
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/40fd70f1099bb7e88abc71b31f27a8f28775171a

small fix to last commit, only disable updating decor size if necessary

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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 4f8a7569fe..f6c6327d12 100644
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -790,10 +790,10 @@ bool wxTopLevelWindowGTK::Show( bool show )
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
-    bool deferShow = show && !m_isShown && m_deferShow && m_deferShowAllowed;
+    bool deferShow = show && !m_isShown && m_deferShow;
     if (deferShow)
     {
-        deferShow = !GTK_WIDGET_REALIZED(m_widget);
+        deferShow = m_deferShowAllowed && !GTK_WIDGET_REALIZED(m_widget);
         if (deferShow)
         {
             deferShow = g_signal_handler_find(m_widget,
@@ -807,19 +807,21 @@ bool wxTopLevelWindowGTK::Show( bool show )
             screen = gtk_widget_get_screen(m_widget);
             GdkAtom atom = gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false);
             deferShow = gdk_x11_screen_supports_net_wm_hint(screen, atom) != 0;
+            // If _NET_REQUEST_FRAME_EXTENTS not supported, don't allow changes
+            // to m_decorSize, it breaks saving/restoring window size with
+            // GetSize()/SetSize() because it makes window bigger between each
+            // restore and save.
+            m_updateDecorSize = deferShow;
         }
         if (deferShow)
         {
             // Fluxbox support for _NET_REQUEST_FRAME_EXTENTS is broken
             const char* name = gdk_x11_screen_get_window_manager_name(screen);
             deferShow = strcmp(name, "Fluxbox") != 0;
+            m_updateDecorSize = deferShow;
         }
 
         m_deferShow = deferShow;
-        // If not deferring, don't allow changes to m_decorSize, it breaks
-        // saving/restoring window size with GetSize()/SetSize() because it
-        // makes window bigger between each restore and save.
-        m_updateDecorSize = !deferShow;
     }
     if (deferShow)
     {