mention wx[Flex]GridSizer too

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 86a63a1090aae5f4c962fbbf844a6cb30168d5fd..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


@@ -395,9 +403,6 @@ void ShowAssertDialog(const wxChar *szFile, int nLine, const wxChar *szMsg)
 // this function is called when an assert fails
 void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 {
 // this function is called when an assert fails
 void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 {

-    wxMessageBox( "ttest", "test", wxOK );
-    return;
-    

     if ( !wxTheApp )
     {
         // by default, show the assert dialog box - we can't customize this
     if ( !wxTheApp )
     {
         // by default, show the assert dialog box - we can't customize this