X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46dc76ba3573649a9ed7c7aff6dc677f533eee11..64a1451536e1917c240a8377c7672ea155e7681d:/src/gtk/app.cpp

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 2317ad5320..7076f02898 100644
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -19,6 +19,8 @@
 #include "wx/intl.h"
 #include "wx/log.h"
 #include "wx/memory.h"
+#include "wx/font.h"
+#include "wx/settings.h"
 
 #include "unistd.h"
 
@@ -34,6 +36,7 @@ wxApp *wxTheApp = NULL;
 wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 extern wxList wxPendingDelete;
+extern wxResourceCache *wxTheResourceCache;
 
 //-----------------------------------------------------------------------------
 // local functions
@@ -242,9 +245,16 @@ 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();
 
   // For PostScript printing
@@ -261,14 +271,24 @@ void wxApp::CommonInit(void)
   g_globalCursor = new wxCursor;
 */
 
-  wxInitializeStockObjects();
+//  wxInitializeStockObjects();
 };
 
 void wxApp::CommonCleanUp(void)
 {
+  wxDELETE(wxTheColourDatabase);
+  wxDELETE(wxThePrintPaperDatabase);
+  wxDELETE(wxThePrintSetupData);
+  wxDELETE(wxTheFontNameDirectory);
   wxDeleteStockObjects();
   
   wxFlushResources();
+
+  wxDELETE(wxTheResourceCache);
+
+  wxDeleteStockLists();
+
+  wxSystemSettings::Done();
 };
     
 wxLog *wxApp::CreateLogTarget()
@@ -302,7 +322,7 @@ int wxEntry( int argc, char *argv[] )
   {
     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;
     };
     
@@ -311,18 +331,14 @@ int wxEntry( int argc, char *argv[] )
     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;
   
@@ -359,6 +375,8 @@ 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