reverted use of DeferWindowPos() instead of MoveWindow()

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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index d2dd37300d05ef691a8b149735415cb7037f5abb..a4ce110bc61517b06b9fc6b1095a81a203336965 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -422,10 +422,6 @@ protected:
     // the old window proc (we subclass all windows)
     WXFARPROC             m_oldWndProc;
 
     // the old window proc (we subclass all windows)
     WXFARPROC             m_oldWndProc;
 

-    // the current multi-window move structure handle, NULL if window resize is
-    // not in process
-    WXHANDLE              m_hDWP;
-

     // additional (MSW specific) flags
     bool                  m_mouseInWindow:1;
     bool                  m_lastKeydownProcessed:1;
     // additional (MSW specific) flags
     bool                  m_mouseInWindow:1;
     bool                  m_lastKeydownProcessed:1;

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index afd85c77ac291d8256269857f568c4ed6cdf3f3a..b5f9bec74a90463caed3c11671799329139fbaf4 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -437,7 +437,6 @@ void wxWindowMSW::Init()
     m_frozenness = 0;
 
     m_hWnd = 0;
     m_frozenness = 0;
 
     m_hWnd = 0;

-    m_hDWP = 0;

 
     m_xThumbSize = 0;
     m_yThumbSize = 0;
 
     m_xThumbSize = 0;
     m_yThumbSize = 0;


@@ -1532,29 +1531,9 @@ void wxWindowMSW::DoMoveWindow(int x, int y, int width, int height)
     if (height < 0)
         height = 0;
 
     if (height < 0)
         height = 0;
 

-    // if our parent had prepared a defer window handle for us, use it
-    HDWP hdwp = m_parent ? (HDWP)m_parent->m_hDWP : NULL;
-    if ( hdwp )
+    if ( !::MoveWindow(GetHwnd(), x, y, width, height, TRUE) )

     {
     {

-        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
-        m_parent->m_hDWP = (WXHANDLE)hdwp;
-    }
-
-    // otherwise (or if deferring failed) move the window in place immediately
-    if ( !hdwp )
-    {
-        if ( !::MoveWindow(GetHwnd(), x, y, width, height, TRUE) )
-        {
-            wxLogLastError(wxT("MoveWindow"));
-        }
+        wxLogLastError(wxT("MoveWindow"));

     }
 }
 
     }
 }
 


@@ -2248,36 +2227,8 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
             (void)HandleDestroy();
             break;
 
             (void)HandleDestroy();
             break;
 

-        case WM_WINDOWPOSCHANGING:
-            {
-                // when we resize this window, its children are probably going
-                // to be repositioned as well, prepare to use DeferWindowPos()
-                // for them
-                const int numChildren = GetChildren().GetCount();
-                if ( numChildren > 1 )
-                {
-                    m_hDWP = (WXHANDLE)::BeginDeferWindowPos(numChildren);
-                    if ( !m_hDWP )
-                    {
-                        wxLogLastError(_T("BeginDeferWindowPos"));
-                    }
-                }
-            }
-            break;
-

         case WM_SIZE:
             processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);
         case WM_SIZE:
             processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);

-
-            if ( m_hDWP )
-            {
-                // put all child controls in place at once now
-                if ( !::EndDeferWindowPos((HDWP)m_hDWP) )
-                {
-                    wxLogLastError(_T("EndDeferWindowPos"));
-                }
-
-                m_hDWP = NULL;
-            }

             break;
 
         case WM_MOVE:
             break;
 
         case WM_MOVE: