X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..9c9c3d7a8f6c4ee3481674e901d34714ee18915d:/src/msw/toplevel.cpp?ds=sidebyside

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index bd65405e7f..4758fd9a52 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -310,9 +310,9 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
 
     if ( !m_hWnd )
     {
-        wxFAIL_MSG(_("Failed to create dialog. Incorrect DLGTEMPLATE?"));
+        wxFAIL_MSG(wxT("Failed to create dialog. Incorrect DLGTEMPLATE?"));
 
-        wxLogSysError(_("Can't create dialog using memory template"));
+        wxLogSysError(wxT("Can't create dialog using memory template"));
 
         return FALSE;
     }
@@ -517,7 +517,10 @@ bool wxTopLevelWindowMSW::Show(bool show)
         }
         else // just show
         {
-            nShowCmd = SW_SHOW;
+           if ( GetWindowStyle() & wxFRAME_TOOL_WINDOW )
+               nShowCmd = SW_SHOWNA;
+           else
+               nShowCmd = SW_SHOW;
         }
     }
     else // hide
@@ -564,7 +567,7 @@ void wxTopLevelWindowMSW::Maximize(bool maximize)
     {
         // we can't maximize the hidden frame because it shows it as well, so
         // just remember that we should do it later in this case
-        m_maximizeOnShow = TRUE;
+        m_maximizeOnShow = maximize;
     }
 }
 
@@ -751,6 +754,12 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event)
         // remember the last focused child if it is our child
         m_winLastFocused = FindFocus();
 
+        if ( m_winLastFocused )
+        {
+            // let it know that it doesn't have focus any more
+            m_winLastFocused->HandleKillFocus((WXHWND)NULL);
+        }
+
         // so we NULL it out if it's a child from some other frame
         wxWindow *win = m_winLastFocused;
         while ( win )