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

Worked around an apparent bug in Windows whereby some deferred positioning

Browse Source 
failed: specifically when changing a position from x, to y, to x again.
Added deferred positioning to wxRadioBox, wxSlider and wxSpinCtrl and thereby
eliminated some refresh glitches when resizing.
Eliminated further refresh glitches caused by wxRadioBox (to nearby controls)
by refreshing parent when the radio box moves.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-04-28 14:45:09 +00:00
parent 2b822a7e06
commit 8e44f3caab
8 changed files with 230 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/msw/window.cpp
View File

@@ -119,6 +119,8 @@
#define HAVE_TRACKMOUSEEVENT
#endif // everything needed for TrackMouseEvent()
#define USE_DEFERRED_SIZING 1
// ---------------------------------------------------------------------------
// global variables
// ---------------------------------------------------------------------------
@@ -468,6 +470,12 @@ wxWindowMSW::~wxWindowMSW()
{
m_isBeingDeleted = true;
if (m_windowReserved)
{
delete (wxExtraWindowData*) m_windowReserved;
m_windowReserved = NULL;
}
#ifndef __WXUNIVERSAL__
// VS: make sure there's no wxFrame with last focus set to us:
for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
@@ -1443,6 +1451,14 @@ void wxWindowMSW::DoSetToolTip(wxToolTip *tooltip)
// Get total size
void wxWindowMSW::DoGetSize(int *x, int *y) const
{
wxExtraWindowData* extraData = (wxExtraWindowData*) m_windowReserved;
if (extraData && extraData->m_deferring && GetParent() && GetParent()->m_hDWP)
{
*x = extraData->m_size.x;
*y = extraData->m_size.y;
return;
}
RECT rect = wxGetWindowRect(GetHwnd());
if ( x )
@@ -1454,6 +1470,14 @@ 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
{
wxExtraWindowData* extraData = (wxExtraWindowData*) m_windowReserved;
if (extraData && extraData->m_deferring && GetParent() && GetParent()->m_hDWP)
{
*x = extraData->m_pos.x;
*y = extraData->m_pos.y;
return;
}
RECT rect = wxGetClientRect(GetHwnd());
if ( x )
@@ -1546,29 +1570,31 @@ void wxWindowMSW::DoMoveWindow(int x, int y, int width, int height)
// if our parent had prepared a defer window handle for us, use it (unless
// we are a top level window)
wxWindowMSW *parent = GetParent();
#if USE_DEFERRED_SIZING
HDWP hdwp = parent && !IsTopLevel() ? (HDWP)parent->m_hDWP : NULL;
#else
HDWP hdwp = 0;
#endif
wxMoveWindowDeferred(hdwp, this, GetHwnd(), x, y, width, height);
if ( hdwp )
{
hdwp = ::DeferWindowPos(hdwp, GetHwnd(), NULL,
x, y, width, height,
SWP_NOZORDER);
if ( !hdwp )
// Store the size so we can report it accurately
wxExtraWindowData* extraData = (wxExtraWindowData*) m_windowReserved;
if (!extraData)
{
wxLogLastError(_T("DeferWindowPos"));
extraData = new wxExtraWindowData;
m_windowReserved = (void*) extraData;
}
extraData->m_pos = wxPoint(x, y);
extraData->m_size = wxSize(width, height);
extraData->m_deferring = true;
// 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
if ( !hdwp )
{
if ( !::MoveWindow(GetHwnd(), x, y, width, height, IsShown()) )
{
wxLogLastError(wxT("MoveWindow"));
}
}
}
// set the size of the window: if the dimensions are positive, just use them,
@@ -5931,6 +5957,31 @@ bool wxWindowMSW::HandleHotKey(WXWPARAM wParam, WXLPARAM lParam)
#endif // wxUSE_HOTKEY
// Moves a window by deferred method or normal method
bool wxMoveWindowDeferred(HDWP& hdwp, wxWindow* win, HWND hWnd, int x, int y, int width, int height)
{
if ( hdwp )
{
hdwp = ::DeferWindowPos(hdwp, hWnd, NULL,
x, y, width, height,
SWP_NOZORDER);
if ( !hdwp )
{
wxLogLastError(_T("DeferWindowPos"));
}
}
// otherwise (or if deferring failed) move the window in place immediately
if ( !hdwp )
{
if ( !::MoveWindow(hWnd, x, y, width, height, win->IsShown()) )
{
wxLogLastError(wxT("MoveWindow"));
}
}
return hdwp != NULL;
}
// Not tested under WinCE
#ifndef __WXWINCE__