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
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user