From f2197644884edc09ebf3515eda6f54c968064491 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 3 Feb 2006 16:30:14 +0000 Subject: [PATCH] Fix for WinCE - no delayed sizing for now git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/window.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 286039c640..cac2a3f2db 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -120,7 +120,11 @@ // resizing complicated window hierarchies, but this can in theory result in // different behaviour than the old code so we keep the possibility to use it // by setting this to 0 (in the future this should be removed completely) +#ifdef __WXWINCE__ +#define USE_DEFERRED_SIZING 0 +#else #define USE_DEFERRED_SIZING 1 +#endif // set this to 1 to filter out duplicate mouse events, e.g. mouse move events // when mouse position didnd't change @@ -1500,9 +1504,10 @@ void wxWindowMSW::DoGetSize(int *x, int *y) const // Get size *available for subwindows* i.e. excluding menu bar etc. void wxWindowMSW::DoGetClientSize(int *x, int *y) const { +#if USE_DEFERRED_SIZING if ( IsTopLevel() || m_pendingSize == wxDefaultSize ) - { - // top level windows resizing is never deferred, so we can safely use +#endif + { // top level windows resizing is never deferred, so we can safely use // the current size here RECT rect = wxGetClientRect(GetHwnd()); @@ -1511,6 +1516,7 @@ void wxWindowMSW::DoGetClientSize(int *x, int *y) const if ( y ) *y = rect.bottom; } +#if USE_DEFERRED_SIZING else // non top level and using deferred sizing { // we need to calculate the *pending* client size here @@ -1527,6 +1533,7 @@ void wxWindowMSW::DoGetClientSize(int *x, int *y) const if ( y ) *y = rect.bottom - rect.top; } +#endif } void wxWindowMSW::DoGetPosition(int *x, int *y) const -- 2.45.2