corrected wxListCtrl compilation problems

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 9cfd6f22531a2c43a37cbef946dbd0a42a588713..877850f5fb307f64991638f6cc465740da72948a 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -18,6 +18,10 @@
 #include "wx/postscrp.h"
 #include "wx/intl.h"
 #include "wx/log.h"
+#include "wx/memory.h"
+#include "wx/font.h"
+#include "wx/settings.h"
+#include "wx/resource.h"
 
 #include "unistd.h"
 
@@ -33,6 +37,7 @@ wxApp *wxTheApp = NULL;
 wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 extern wxList wxPendingDelete;
+extern wxResourceCache *wxTheResourceCache;
 
 //-----------------------------------------------------------------------------
 // local functions
@@ -47,13 +52,13 @@ extern void wxFlushResources(void);
 void wxExit(void)
 {
   gtk_main_quit();
-};
+}
 
 bool wxYield(void)
 {
   while (gtk_events_pending() > 0) gtk_main_iteration();
   return TRUE;
-};
+}
 
 //-----------------------------------------------------------------------------
 // wxApp
@@ -67,38 +72,38 @@ END_EVENT_TABLE()
 
 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
-  if (wxTheApp) while (wxTheApp->ProcessIdle()) {};
+  if (wxTheApp) while (wxTheApp->ProcessIdle()) {}
   usleep( 10000 );
   return TRUE;
-};
+}
 
 wxApp::wxApp()
 {
   m_idleTag = 0;
   m_topWindow = NULL;
   m_exitOnFrameDelete = TRUE;
-};
+}
 
 wxApp::~wxApp(void)
 {
   gtk_idle_remove( m_idleTag );
-};
+}
 
 bool wxApp::OnInit(void)
 {
   return TRUE;
-};
+}
 
 bool wxApp::OnInitGui(void)
 { 
   m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL );
   return TRUE; 
-};
+}
 
 int wxApp::OnRun(void) 
 { 
   return MainLoop(); 
-};
+}
 
 bool wxApp::ProcessIdle(void)
 {
@@ -107,7 +112,7 @@ bool wxApp::ProcessIdle(void)
   ProcessEvent( event );
   
   return event.MoreRequested();
-};
+}
 
 void wxApp::OnIdle( wxIdleEvent &event )
 {
@@ -134,7 +139,7 @@ void wxApp::OnIdle( wxIdleEvent &event )
     event.RequestMore(TRUE);
 
   inOnIdle = FALSE;
-};
+}
 
 bool wxApp::SendIdleEvents(void)
 {
@@ -149,7 +154,7 @@ bool wxApp::SendIdleEvents(void)
                node = node->Next();
        }
     return needMore;
-};
+}
 
 bool wxApp::SendIdleEvents( wxWindow* win )
 {
@@ -172,37 +177,37 @@ bool wxApp::SendIdleEvents( wxWindow* win )
                node = node->Next();
        }
     return needMore ;
-};
+}
 
 int wxApp::OnExit(void)
 {
   return 0;
-};
+}
 
 int wxApp::MainLoop(void)
 {
   gtk_main();
   return 0;
-};
+}
 
 void wxApp::ExitMainLoop(void)
 {
   gtk_main_quit();
-};
+}
 
 bool wxApp::Initialized(void)
 {
   return m_initialized;
-};
+}
 
 bool wxApp::Pending(void) 
 {
   return FALSE;
-};
+}
 
 void wxApp::Dispatch(void) 
 {
-};
+}
 
 void wxApp::DeletePendingObjects(void)
 {
@@ -217,8 +222,8 @@ void wxApp::DeletePendingObjects(void)
       delete node;
 
     node = wxPendingDelete.First();
-  };
-};
+  }
+}
 
 wxWindow *wxApp::GetTopWindow(void)
 {
@@ -226,12 +231,12 @@ wxWindow *wxApp::GetTopWindow(void)
   wxNode *node = wxTopLevelWindows.First();
   if (!node) return NULL;
   return (wxWindow*)node->Data();
-};
+}
 
 void wxApp::SetTopWindow( wxWindow *win )
 {
   m_topWindow = win;
-};
+}
 
 void wxApp::CommonInit(void)
 {
@@ -241,11 +246,20 @@ void wxApp::CommonInit(void)
   (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
 #endif
 */
+  wxSystemSettings::Init();
+  wxTheResourceCache = new wxResourceCache(wxKEY_STRING);
+
+  wxTheFontNameDirectory =  new wxFontNameDirectory;
+  wxTheFontNameDirectory->Initialize();
 
   wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
   wxTheColourDatabase->Initialize();
+
+  wxInitializeStockLists();
   wxInitializeStockObjects();
 
+  wxInitializeResourceSystem();
+  
   // For PostScript printing
 #if USE_POSTSCRIPT
   wxInitializePrintSetupData();
@@ -259,16 +273,26 @@ void wxApp::CommonInit(void)
 
   g_globalCursor = new wxCursor;
 */
-
-  wxInitializeStockObjects();
-};
+}
 
 void wxApp::CommonCleanUp(void)
 {
+  wxDELETE(wxTheColourDatabase);
+  wxDELETE(wxThePrintPaperDatabase);
+  wxDELETE(wxThePrintSetupData);
+  wxDELETE(wxTheFontNameDirectory);
   wxDeleteStockObjects();
   
   wxFlushResources();
-};
+
+  wxDELETE(wxTheResourceCache);
+
+  wxDeleteStockLists();
+
+  wxCleanUpResourceSystem();
+  
+  wxSystemSettings::Done();
+}
     
 wxLog *wxApp::CreateLogTarget()
 {
@@ -285,31 +309,39 @@ 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 (!wxTheApp)
   {
     if (!wxApp::GetInitializerFunction())
     {
-      printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
+      printf( _("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
       return 0;
-    };
+    }
     
     wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
     
     wxObject *test_app = app_ini();
     
     wxTheApp = (wxApp*) test_app;
-    
-//    wxTheApp = (wxApp*)( app_ini() );
-  };
+  }
   
   if (!wxTheApp) 
   {
-    printf( "wxWindows error: wxTheApp == NULL\n" );
+    printf( _("wxWindows error: wxTheApp == NULL\n") );
     return 0;
-  };
+  }
 
-//  printf( "Programmstart.\n" );
-  
   wxTheApp->argc = argc;
   wxTheApp->argv = argv;
   
@@ -346,9 +378,25 @@ int wxEntry( int argc, char *argv[] )
   wxTheApp->OnExit();
   
   wxApp::CommonCleanUp();
+
+  wxDELETE(wxTheApp);
+  
+#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;
-};
+}
 
 //-----------------------------------------------------------------------------
 // main()