Oops, compile errors...

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

diff --git a/src/stubs/app.cpp b/src/stubs/app.cpp
index d879be671267196783a3333f91e08b6112c1cb1e..681e66155693cdf5c877bb8212e7bc14cbf22ce6 100644 (file)
--- a/src/stubs/app.cpp
+++ b/src/stubs/app.cpp
@@ -29,14 +29,10 @@
 #include "wx/module.h"
 #include "wx/memory.h"
 
-#if USE_WX_RESOURCES
+#if wxUSE_WX_RESOURCES
 #include "wx/resource.h"
 #endif
 
-#if USE_POSTSCRIPT
-#include "wx/postscrp.h"
-#endif
-
 #include <string.h>
 
 extern char *wxBuffer;
@@ -44,16 +40,14 @@ extern wxList wxPendingDelete;
 
 wxApp *wxTheApp = NULL;
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
 END_EVENT_TABLE()
-#endif
 
 long wxApp::sm_lastMessageTime = 0;
 
-void wxApp::CommonInit()
+bool wxApp::Initialize()
 {
 #ifdef __WXMSW__
   wxBuffer = new char[1500];
@@ -61,40 +55,47 @@ void wxApp::CommonInit()
   wxBuffer = new char[BUFSIZ + 512];
 #endif
 
+/* 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
+*/
+  
   wxClassInfo::InitializeClasses();
 
   wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
   wxTheColourDatabase->Initialize();
+
+  wxInitializeStockLists();
   wxInitializeStockObjects();
 
-#if USE_WX_RESOURCES
+#if wxUSE_WX_RESOURCES
   wxInitializeResourceSystem();
 #endif
 
-  // For PostScript printing
-#if USE_POSTSCRIPT
-  wxInitializePrintSetupData();
-  wxThePrintPaperDatabase = new wxPrintPaperDatabase;
-  wxThePrintPaperDatabase->CreateDatabase();
-#endif
-
   wxBitmap::InitStandardHandlers();
 
   wxModule::RegisterModules();
   wxASSERT( wxModule::InitializeModules() == TRUE );
+
+  return TRUE;
 }
 
-void wxApp::CommonCleanUp()
+void wxApp::CleanUp()
 {
   wxModule::CleanUpModules();
 
-#if USE_WX_RESOURCES
+#if wxUSE_WX_RESOURCES
   wxCleanUpResourceSystem();
 #endif
 
   wxDeleteStockObjects() ;
 
   // Destroy all GDI lists, etc.
+
   delete wxTheBrushList;
   wxTheBrushList = NULL;
 
@@ -110,37 +111,40 @@ void wxApp::CommonCleanUp()
   delete wxTheColourDatabase;
   wxTheColourDatabase = NULL;
 
-#if USE_POSTSCRIPT
-  wxInitializePrintSetupData(FALSE);
-  delete wxThePrintPaperDatabase;
-  wxThePrintPaperDatabase = NULL;
-#endif
-
   wxBitmap::CleanUpHandlers();
 
   delete[] wxBuffer;
   wxBuffer = NULL;
 
+  wxClassInfo::CleanUpClasses();
+
+  delete wxTheApp;
+  wxTheApp = NULL;
+  
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+  // At this point we want to check if there are any memory
+  // blocks that aren't part of the wxDebugContext itself,
+  // as a special case. Then when dumping we need to ignore
+  // wxDebugContext, too.
+  if (wxDebugContext::CountObjectsLeft() > 0)
+  {
+    wxTrace("There were memory leaks.\n");
+    wxDebugContext::Dump();
+    wxDebugContext::PrintStatistics();
+  }
+//  wxDebugContext::SetStream(NULL, NULL);
+#endif
+  
+  // do it as the very last thing because everything else can log messages
+  wxLog::DontCreateOnDemand();
   // do it as the very last thing because everything else can log messages
   delete wxLog::SetActiveTarget(NULL);
 }
 
 int wxEntry( int argc, char *argv[] )
 {
-  wxClassInfo::InitializeClasses();
-  
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
-
-#if !defined(_WINDLL)
-  streambuf* sBuf = new wxDebugStreamBuf;
-#else
-  streambuf* sBuf = NULL;
-#endif
-  ostream* oStr = new ostream(sBuf) ;
-  wxDebugContext::SetStream(oStr, sBuf);
-
-#endif
-  
+  if (!wxApp::Initialize())
+    return FALSE;
   if (!wxTheApp)
   {
     if (!wxApp::GetInitializerFunction())
@@ -161,10 +165,6 @@ int wxEntry( int argc, char *argv[] )
   wxTheApp->argc = argc;
   wxTheApp->argv = argv;
 
-  // TODO: your platform-specific initialization.
-
-  wxApp::CommonInit();
-
   // GUI-specific initialization, such as creating an app context.
   wxTheApp->OnInitGui();
 
@@ -177,27 +177,19 @@ int wxEntry( int argc, char *argv[] )
   int retValue = 0;
   
   if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
+
+  if (wxTheApp->GetTopWindow())
+  {
+    delete wxTheApp->GetTopWindow();
+    wxTheApp->SetTopWindow(NULL);
+  }
   
   wxTheApp->DeletePendingObjects();  
   
   wxTheApp->OnExit();
   
-  wxApp::CommonCleanUp();
-  
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
-  // At this point we want to check if there are any memory
-  // blocks that aren't part of the wxDebugContext itself,
-  // as a special case. Then when dumping we need to ignore
-  // wxDebugContext, too.
-  if (wxDebugContext::CountObjectsLeft() > 0)
-  {
-    wxTrace("There were memory leaks.\n");
-    wxDebugContext::Dump();
-    wxDebugContext::PrintStatistics();
-  }
-  wxDebugContext::SetStream(NULL, NULL);
-#endif
-  
+  wxApp::CleanUp();
+
   return retValue;
 };
 
@@ -332,7 +324,7 @@ bool wxApp::SendIdleEvents(wxWindow* win)
     if (event.MoreRequested())
         needMore = TRUE;
 
-       wxNode* node = win->GetChildren()->First();
+       wxNode* node = win->GetChildren().First();
        while (node)
        {
                wxWindow* win = (wxWindow*) node->Data();
@@ -379,7 +371,7 @@ wxWindow* wxApp::GetTopWindow() const
 
 void wxExit()
 {
-  wxApp::CommonCleanUp();
+  wxApp::CleanUp();
 /*
  * TODO: Exit in some platform-specific way. Not recommended that the app calls this:
  * only for emergencies.