reverted the fix for Unicode compilation with VC++ as it breaks other ports (and...

[wxWidgets.git] / src / common / appcmn.cpp

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 3de3b7cd2be6e0b515ee7bdf7721bf20a94d9ea1..608a40ea4e023baa1930d4ba6fd262d222963da2 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -141,7 +141,15 @@ void wxAppBase::ProcessPendingEvents()
 
 void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus))
 {
 
 void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus))
 {

+    if ( active == m_isActive )
+        return;
+

     m_isActive = active;
     m_isActive = active;

+
+    wxActivateEvent event(wxEVT_ACTIVATE_APP, active);
+    event.SetEventObject(this);
+
+    (void)ProcessEvent(event);

 }
 
 #endif // wxUSE_GUI
 }
 
 #endif // wxUSE_GUI


@@ -206,7 +214,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
             OPTION_VERBOSE,
             gettext_noop("generate verbose log messages")
         },
             OPTION_VERBOSE,
             gettext_noop("generate verbose log messages")
         },

-#endif wxUSE_LOG
+#endif // wxUSE_LOG

 
 #ifdef __WXUNIVERSAL__
         {
 
 #ifdef __WXUNIVERSAL__
         {