reversed disabling of deferred resizing in the last check in

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

diff --git a/docs/latex/wx/sysopt.tex b/docs/latex/wx/sysopt.tex
index d4c091388eb90b02062ff8caf8d20c08469e39db..91ffd8eba42ccced16509b1198a231b20f9b5c45 100644 (file)
--- a/docs/latex/wx/sysopt.tex
+++ b/docs/latex/wx/sysopt.tex
@@ -28,8 +28,6 @@ pages).}
 \twocolitem{msw.staticbitmap.htclient}{If set to 1, allows the static bitmap to respond to mouse
 events. The default is 0, since a value of 1 can interfere with refresh in static boxes. Note that once set,
 this option cannot be unset later in the application.}
 \twocolitem{msw.staticbitmap.htclient}{If set to 1, allows the static bitmap to respond to mouse
 events. The default is 0, since a value of 1 can interfere with refresh in static boxes. Note that once set,
 this option cannot be unset later in the application.}

-\twocolitem{msw.window.defersize}{If set to 1, optimizes window sizing and positioning when a size event is
-received. This can occasionally have unwanted side-effects, so is off by default.}

 \end{twocollist}
 
 \wxheading{Mac}
 \end{twocollist}
 
 \wxheading{Mac}

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 163c0df7ea012372749f0cbff4f4d716ef43c272..78de9b7a435c8148c0a869a91fa86cb971cfda53 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1505,26 +1505,23 @@ void wxWindowMSW::DoMoveWindow(int x, int y, int width, int height)
         height = 0;
 
     HDWP hdwp = 0;
         height = 0;
 
     HDWP hdwp = 0;

-    
-    if ( wxSystemOptions::GetOptionInt(wxT("msw.window.defersize")) == 1 )
-    {
-        // if our parent had prepared a defer window handle for us, use it (unless
-        // we are a top level window)
-        wxWindowMSW *parent = GetParent();
-        hdwp = (parent && !IsTopLevel()) ? (HDWP)parent->m_hDWP : NULL;
-        if ( hdwp )
-        {
-            hdwp = ::DeferWindowPos(hdwp, GetHwnd(), NULL,
-                                x, y, width, height,
-                                SWP_NOZORDER);
-            if ( !hdwp )
-            {
-                wxLogLastError(_T("DeferWindowPos"));
-            }

 
 

-            // hdwp must be updated as it may have been changed
-            parent->m_hDWP = (WXHANDLE)hdwp;
+    // if our parent had prepared a defer window handle for us, use it (unless
+    // we are a top level window)
+    wxWindowMSW *parent = GetParent();
+    hdwp = (parent && !IsTopLevel()) ? (HDWP)parent->m_hDWP : NULL;
+    if ( hdwp )
+    {
+        hdwp = ::DeferWindowPos(hdwp, GetHwnd(), NULL,
+                            x, y, width, height,
+                            SWP_NOZORDER);
+        if ( !hdwp )
+        {
+            wxLogLastError(_T("DeferWindowPos"));

         }
         }

+
+        // hdwp must be updated as it may have been changed
+        parent->m_hDWP = (WXHANDLE)hdwp;

     }
 
     // otherwise (or if deferring failed) move the window in place immediately
     }
 
     // otherwise (or if deferring failed) move the window in place immediately


@@ -4110,13 +4107,10 @@ bool wxWindowMSW::HandleSize(int WXUNUSED(w), int WXUNUSED(h), WXUINT wParam)
     const int numChildren = GetChildren().GetCount();
     if ( numChildren > 1 )
     {
     const int numChildren = GetChildren().GetCount();
     if ( numChildren > 1 )
     {

-        if ( wxSystemOptions::GetOptionInt(wxT("msw.window.defersize")) == 1 )
+        m_hDWP = (WXHANDLE)::BeginDeferWindowPos(numChildren);
+        if ( !m_hDWP )

         {
         {

-            m_hDWP = (WXHANDLE)::BeginDeferWindowPos(numChildren);
-            if ( !m_hDWP )
-            {
-                wxLogLastError(_T("BeginDeferWindowPos"));
-            }
+            wxLogLastError(_T("BeginDeferWindowPos"));

         }
     }
 
         }
     }