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

fixed wxMaximizeEvent generation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-09-15 22:14:05 +00:00
parent b7ecdec5aa
commit 4bc0f25ed7
3 changed files with 44 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/msw/window.cpp
View File

@@ -2285,31 +2285,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
#endif
case WM_SIZE:
switch ( wParam )
{
case SIZE_MAXHIDE:
case SIZE_MAXSHOW:
// we're not interested in these messages at all
break;
case SIZE_MINIMIZED:
// we shouldn't send sizev events for these messages as the
// client size may be negative which breaks existing code
//
// OTOH we might send another (wxMinimizedEvent?) one or
// add an additional parameter to wxSizeEvent if this is
// useful to anybody
break;
default:
wxFAIL_MSG( _T("unexpected WM_SIZE parameter") );
// fall through nevertheless
case SIZE_MAXIMIZED:
case SIZE_RESTORED:
processed = HandleSize(LOWORD(lParam), HIWORD(lParam),
wParam);
}
processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);
break;
#if !defined(__WXWINCE__)
@@ -4187,16 +4163,40 @@ bool wxWindowMSW::HandleMoving(wxRect& rect)
return rc;
}
bool wxWindowMSW::HandleSize(int WXUNUSED(w), int WXUNUSED(h),
WXUINT WXUNUSED(flag))
bool wxWindowMSW::HandleSize(int WXUNUSED(w), int WXUNUSED(h), WXUINT wParam)
{
// don't use w and h parameters as they specify the client size while
// according to the docs EVT_SIZE handler is supposed to receive the total
// size
wxSizeEvent event(GetSize(), m_windowId);
event.SetEventObject(this);
bool processed = false;
return GetEventHandler()->ProcessEvent(event);
switch ( wParam )
{
default:
wxFAIL_MSG( _T("unexpected WM_SIZE parameter") );
// fall through nevertheless
case SIZE_MAXHIDE:
case SIZE_MAXSHOW:
// we're not interested in these messages at all
break;
case SIZE_MINIMIZED:
processed = HandleMinimize();
break;
case SIZE_MAXIMIZED:
processed = HandleMaximize();
// fall through to send a normal size event as well
case SIZE_RESTORED:
// don't use w and h parameters as they specify the client size
// while according to the docs EVT_SIZE handler is supposed to
// receive the total size
wxSizeEvent event(GetSize(), m_windowId);
event.SetEventObject(this);
processed = GetEventHandler()->ProcessEvent(event);
}
return processed;
}
bool wxWindowMSW::HandleSizing(wxRect& rect)