SN: Added #pragma implementation needed by GCC - expect more to come

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

diff --git a/src/stubs/app.cpp b/src/stubs/app.cpp
index 6274caf50eab4e560e3e0ae17d166a6214b3d376..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"
 
 #include "wx/module.h"
 #include "wx/memory.h"
 

-#if USE_WX_RESOURCES
+#if wxUSE_WX_RESOURCES

 #include "wx/resource.h"
 #endif
 
 #include "wx/resource.h"
 #endif
 

-#if USE_POSTSCRIPT
-#include "wx/postscrp.h"
-#endif
-

 #include <string.h>
 
 extern char *wxBuffer;
 #include <string.h>
 
 extern char *wxBuffer;


@@ -44,12 +40,10 @@ extern wxList wxPendingDelete;
 
 wxApp *wxTheApp = NULL;
 
 
 wxApp *wxTheApp = NULL;
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
 END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
 END_EVENT_TABLE()

-#endif

 
 long wxApp::sm_lastMessageTime = 0;
 
 
 long wxApp::sm_lastMessageTime = 0;
 


@@ -61,31 +55,27 @@ bool wxApp::Initialize()
   wxBuffer = new char[BUFSIZ + 512];
 #endif
 
   wxBuffer = new char[BUFSIZ + 512];
 #endif
 

-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+/* 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);
 
   streambuf* sBuf = new wxDebugStreamBuf;
   ostream* oStr = new ostream(sBuf) ;
   wxDebugContext::SetStream(oStr, sBuf);

-

 #endif
 #endif

+*/

   
   wxClassInfo::InitializeClasses();
 
   wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
   wxTheColourDatabase->Initialize();
   
   wxClassInfo::InitializeClasses();
 
   wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
   wxTheColourDatabase->Initialize();

+
+  wxInitializeStockLists();

   wxInitializeStockObjects();
 
   wxInitializeStockObjects();
 

-#if USE_WX_RESOURCES
+#if wxUSE_WX_RESOURCES

   wxInitializeResourceSystem();
 #endif
 
   wxInitializeResourceSystem();
 #endif
 

-  // For PostScript printing
-#if USE_POSTSCRIPT
-  wxInitializePrintSetupData();
-  wxThePrintPaperDatabase = new wxPrintPaperDatabase;
-  wxThePrintPaperDatabase->CreateDatabase();
-#endif
-

   wxBitmap::InitStandardHandlers();
 
   wxModule::RegisterModules();
   wxBitmap::InitStandardHandlers();
 
   wxModule::RegisterModules();


@@ -98,7 +88,7 @@ void wxApp::CleanUp()
 {
   wxModule::CleanUpModules();
 
 {
   wxModule::CleanUpModules();
 

-#if USE_WX_RESOURCES
+#if wxUSE_WX_RESOURCES

   wxCleanUpResourceSystem();
 #endif
 
   wxCleanUpResourceSystem();
 #endif
 


@@ -121,12 +111,6 @@ void wxApp::CleanUp()
   delete wxTheColourDatabase;
   wxTheColourDatabase = NULL;
 
   delete wxTheColourDatabase;
   wxTheColourDatabase = NULL;
 

-#if USE_POSTSCRIPT
-  wxInitializePrintSetupData(FALSE);
-  delete wxThePrintPaperDatabase;
-  wxThePrintPaperDatabase = NULL;
-#endif
-

   wxBitmap::CleanUpHandlers();
 
   delete[] wxBuffer;
   wxBitmap::CleanUpHandlers();
 
   delete[] wxBuffer;


@@ -134,6 +118,23 @@ void wxApp::CleanUp()
 
   wxClassInfo::CleanUpClasses();
 
 
   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
   // 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


@@ -189,23 +190,6 @@ int wxEntry( int argc, char *argv[] )
   
   wxApp::CleanUp();
 
   
   wxApp::CleanUp();
 

-  delete wxTheApp;
-  wxTheApp = NULL;
-  
-#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
-  

   return retValue;
 };
 
   return retValue;
 };
 


@@ -340,7 +324,7 @@ bool wxApp::SendIdleEvents(wxWindow* win)
     if (event.MoreRequested())
         needMore = TRUE;
 
     if (event.MoreRequested())
         needMore = TRUE;
 

-       wxNode* node = win->GetChildren()->First();
+       wxNode* node = win->GetChildren().First();

        while (node)
        {
                wxWindow* win = (wxWindow*) node->Data();
        while (node)
        {
                wxWindow* win = (wxWindow*) node->Data();