X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d8bd2496ec037f729df0eb60416667f655dda3d..c4218a74033e3091a3566c9c6619809a00b53744:/src/msw/frame.cpp?ds=sidebyside diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 9eb14a0f07..b37499c2fa 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -260,22 +260,20 @@ void wxFrame::DoSetClientSize(int width, int height) void wxFrame::DoGetSize(int *width, int *height) const { - RECT rect; - GetWindowRect(GetHwnd(), &rect); - *width = rect.right - rect.left; - *height = rect.bottom - rect.top; + RECT rect; + ::GetWindowRect(GetHwnd(), &rect); + + *width = rect.right - rect.left; + *height = rect.bottom - rect.top; } void wxFrame::DoGetPosition(int *x, int *y) const { - RECT rect; - GetWindowRect(GetHwnd(), &rect); - POINT point; - point.x = rect.left; - point.y = rect.top; + RECT rect; + ::GetWindowRect(GetHwnd(), &rect); - *x = point.x; - *y = point.y; + *x = rect.left; + *y = rect.top; } // ---------------------------------------------------------------------------- @@ -976,6 +974,8 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id) // restore all child frames too IconizeChildFrames(FALSE); + (void)SendIconizeEvent(FALSE); + // fall through case SIZEFULLSCREEN: @@ -986,6 +986,8 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id) // iconize all child frames too IconizeChildFrames(TRUE); + (void)SendIconizeEvent(); + m_iconized = TRUE; break; }