Turned wxIcon inline constructors to real constructors

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 7beb0561a424ab66f02d0e2f3673d42c40029e37..a45bf2ea6b2ae92b0c388cfd7ab07d8700ae0691 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -683,6 +683,12 @@ void wxFrame::MSWOnSize(int x, int y, WXUINT id)
   switch (id)
   {
     case SIZENORMAL:
+      // only do it it if we were iconized before, otherwise resizing the
+      // parent frame has a curious side effect of bringing it under it's
+      // children
+      if ( !m_iconized )
+        break;
+
       // restore all child frames too
       IconizeChildFrames(FALSE);
 
@@ -690,14 +696,14 @@ void wxFrame::MSWOnSize(int x, int y, WXUINT id)
 
     case SIZEFULLSCREEN:
       m_iconized = FALSE;
-    break;
+      break;
 
     case SIZEICONIC:
       // iconize all child frames too
       IconizeChildFrames(TRUE);
 
       m_iconized = TRUE;
-    break;
+      break;
   }
 
  if (!m_iconized)