1. derive wxGTK wxRadioBox from wxRadioBoxBase now, as in all other ports

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

diff --git a/src/common/init.cpp b/src/common/init.cpp
index aaeec98204efee2bf87b15a2996358d4b423578a..9b87e1815244d7fbf73bbd262ffa881a144a862a 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -70,8 +70,8 @@ public:
 
 // we need a special kind of auto pointer to wxApp which not only deletes the
 // pointer it holds in its dtor but also resets the global application pointer
 
 // we need a special kind of auto pointer to wxApp which not only deletes the
 // pointer it holds in its dtor but also resets the global application pointer

-wxDECLARE_SCOPED_PTR(wxAppConsole, wxAppPtrBase);
-wxDEFINE_SCOPED_PTR(wxAppConsole, wxAppPtrBase);
+wxDECLARE_SCOPED_PTR(wxAppConsole, wxAppPtrBase)
+wxDEFINE_SCOPED_PTR(wxAppConsole, wxAppPtrBase)

 
 class wxAppPtr : public wxAppPtrBase
 {
 
 class wxAppPtr : public wxAppPtrBase
 {


@@ -364,7 +364,10 @@ static void DoCommonPostCleanup()
     FreeConvertedArgs();
 #endif // wxUSE_UNICODE
 
     FreeConvertedArgs();
 #endif // wxUSE_UNICODE
 

-    // Note: check for memory leaks is now done via wxDebugContextDumpDelayCounter
+    // use Set(NULL) and not Get() to avoid creating a message output object on
+    // demand when we just want to delete it
+    delete wxMessageOutput::Set(NULL);
+

 #if wxUSE_LOG
     // and now delete the last logger as well
     delete wxLog::SetActiveTarget(NULL);
 #if wxUSE_LOG
     // and now delete the last logger as well
     delete wxLog::SetActiveTarget(NULL);