corrected use of Print Manager Session APIs for Carbon targets

[wxWidgets.git] / src / msw / frame.cpp

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 9eb14a0f07c0a321df6029fafa67c8d6e70eb773..b37499c2fa5db2966af78b58c138e3458c240d1e 100644 (file)
--- 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
 {
 
 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
 {
 }
 
 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);
 
             // restore all child frames too
             IconizeChildFrames(FALSE);
 

+            (void)SendIconizeEvent(FALSE);
+

             // fall through
 
         case SIZEFULLSCREEN:
             // fall through
 
         case SIZEFULLSCREEN:


@@ -986,6 +986,8 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id)
             // iconize all child frames too
             IconizeChildFrames(TRUE);
 
             // iconize all child frames too
             IconizeChildFrames(TRUE);
 

+            (void)SendIconizeEvent();
+

             m_iconized = TRUE;
             break;
     }
             m_iconized = TRUE;
             break;
     }