recommit after mac binary lapsus

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 9cc4f1d2ffcd008a219ae3e032954386897fefb7..0358aafc346d8afa639a5f04d8e64572aa7ed985 100644 (file)
--- 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;
     }
@@ -754,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(NULL);
+        }
+
         // so we NULL it out if it's a child from some other frame
         wxWindow *win = m_winLastFocused;
         while ( win )