Fixed small alignment issues

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 4ab30907af24e592f9df5fcdcc8d02c16d34f567..3136e36631a5f52a5e7b2a3436d0e065432147b3 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -599,6 +599,8 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
 
 wxTopLevelWindowMSW::~wxTopLevelWindowMSW()
 {
 
 wxTopLevelWindowMSW::~wxTopLevelWindowMSW()
 {

+    SendDestroyEvent();
+

 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)
     SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo;
     delete info;
 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)
     SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo;
     delete info;


@@ -651,6 +653,11 @@ bool wxTopLevelWindowMSW::Show(bool show)
 
             m_maximizeOnShow = false;
         }
 
             m_maximizeOnShow = false;
         }

+        else if ( m_iconized )
+        {
+            // iconize and show
+            nShowCmd = SW_MINIMIZE;
+        }

         else // just show
         {
             // we shouldn't use SW_SHOW which also activates the window for
         else // just show
         {
             // we shouldn't use SW_SHOW which also activates the window for


@@ -734,7 +741,17 @@ bool wxTopLevelWindowMSW::IsMaximized() const
 
 void wxTopLevelWindowMSW::Iconize(bool iconize)
 {
 
 void wxTopLevelWindowMSW::Iconize(bool iconize)
 {

-    DoShowWindow(iconize ? SW_MINIMIZE : SW_RESTORE);
+    if ( IsShown() )
+    {
+        // change the window state immediately
+        DoShowWindow(iconize ? SW_MINIMIZE : SW_RESTORE);
+    }
+    else // hidden
+    {
+        // iconizing the window shouldn't show it so just remember that we need
+        // to become iconized when shown later
+        m_iconized = true;
+    }

 }
 
 bool wxTopLevelWindowMSW::IsIconized() const
 }
 
 bool wxTopLevelWindowMSW::IsIconized() const


@@ -742,6 +759,9 @@ bool wxTopLevelWindowMSW::IsIconized() const
 #ifdef __WXWINCE__
     return false;
 #else
 #ifdef __WXWINCE__
     return false;
 #else

+    if ( !IsShown() )
+        return m_iconized;
+

     // don't use m_iconized, it may be briefly out of sync with the real state
     // as it's only modified when we receive a WM_SIZE and we could be called
     // from an event handler from one of the messages we receive before it,
     // don't use m_iconized, it may be briefly out of sync with the real state
     // as it's only modified when we receive a WM_SIZE and we could be called
     // from an event handler from one of the messages we receive before it,