Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverted/commented out unsuccessful defer fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-04-28 18:21:03 +00:00
parent 83c8bcfde6
commit 283587a491
5 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/msw/window.cpp
View File

@@ -120,6 +120,7 @@
#endif // everything needed for TrackMouseEvent()
#define USE_DEFERRED_SIZING 1
#define USE_DEFER_BUG_WORKAROUND 0
// ---------------------------------------------------------------------------
// global variables
@@ -1451,6 +1452,7 @@ void wxWindowMSW::DoSetToolTip(wxToolTip *tooltip)
// Get total size
void wxWindowMSW::DoGetSize(int *x, int *y) const
{
#if USE_DEFER_BUG_WORKAROUND
wxExtraWindowData* extraData = (wxExtraWindowData*) m_windowReserved;
if (extraData && extraData->m_deferring && GetParent() && GetParent()->m_hDWP)
{
@@ -1458,6 +1460,7 @@ void wxWindowMSW::DoGetSize(int *x, int *y) const
*y = extraData->m_size.y;
return;
}
#endif
RECT rect = wxGetWindowRect(GetHwnd());
@@ -1480,6 +1483,7 @@ void wxWindowMSW::DoGetClientSize(int *x, int *y) const
void wxWindowMSW::DoGetPosition(int *x, int *y) const
{
#if USE_DEFER_BUG_WORKAROUND
wxExtraWindowData* extraData = (wxExtraWindowData*) m_windowReserved;
if (extraData && extraData->m_deferring && GetParent() && GetParent()->m_hDWP)
{
@@ -1487,6 +1491,7 @@ void wxWindowMSW::DoGetPosition(int *x, int *y) const
*y = extraData->m_pos.y;
return;
}
#endif
RECT rect = wxGetWindowRect(GetHwnd());
@@ -4241,6 +4246,7 @@ bool wxWindowMSW::HandleSize(int WXUNUSED(w), int WXUNUSED(h), WXUINT wParam)
wxLogLastError(_T("EndDeferWindowPos"));
}
#if USE_DEFER_BUG_WORKAROUND
// Seems to be a bug in DeferWindowPos such that going from (a) to (b) to (a)
// doesn't work (omits last position/size). So check if there's a disparity,
// and correct.
@@ -4260,6 +4266,7 @@ bool wxWindowMSW::HandleSize(int WXUNUSED(w), int WXUNUSED(h), WXUINT wParam)
extraData->m_deferring = false;
}
}
#endif
}
#endif