vsprintf() is ANSI so there is normally no need to test for it

[wxWidgets.git] / src / gtk1 / app.cpp

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index f65ab8ecafa32e8055e8105c821a3a178032d4d0..05395a5b4682c069ab043eb870afd6f9bbf97379 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -20,6 +20,7 @@
 #include "wx/font.h"
 #include "wx/settings.h"
 #include "wx/resource.h"
+#include "wx/module.h"
 
 #include "unistd.h"
 
@@ -362,13 +363,14 @@ int wxEntry( int argc, char *argv[] )
 
   wxClassInfo::InitializeClasses();
 
+  /* Debug stream no longer used
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 
   streambuf* sBuf = new wxDebugStreamBuf;
   ostream* oStr = new ostream(sBuf) ;
   wxDebugContext::SetStream(oStr, sBuf);
-
 #endif
+*/
 
   if (!wxTheApp)
   {
@@ -423,6 +425,9 @@ int wxEntry( int argc, char *argv[] )
 
   wxApp::CommonInit();
 
+  wxModule::RegisterModules();
+  if (!wxModule::InitializeModules()) return FALSE;
+    
   wxTheApp->OnInitGui();
 
   // Here frames insert themselves automatically
@@ -441,13 +446,12 @@ int wxEntry( int argc, char *argv[] )
 
   wxTheApp->OnExit();
 
+  wxModule::CleanUpModules();
+  
   wxApp::CommonCleanUp();
 
   wxDELETE(wxTheApp);
 
-  wxLog *oldLog = wxLog::SetActiveTarget( NULL );
-  if (oldLog) delete oldLog;
-  
   wxClassInfo::CleanUpClasses();
   
   delete[] wxBuffer;
@@ -456,14 +460,18 @@ int wxEntry( int argc, char *argv[] )
   
   if (wxDebugContext::CountObjectsLeft() > 0)
   {
-    wxTrace("There were memory leaks.\n");
+    wxLogDebug("There were memory leaks.\n");
     wxDebugContext::Dump();
     wxDebugContext::PrintStatistics();
   }
-  wxDebugContext::SetStream(NULL, NULL);
+//  wxDebugContext::SetStream(NULL, NULL);
   
 #endif
 
+  wxLog *oldLog = wxLog::SetActiveTarget( NULL );
+  if (oldLog) delete oldLog;
+
+
   return retValue;
 }