X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff7b1510ea7f7855091df83d75a44415dc1cba18..520e470fdd0daef09c77938db642e4583933c90d:/src/gtk1/app.cpp

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 877850f5fb..fb0c54118a 100644
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -15,7 +15,6 @@
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
-#include "wx/postscrp.h"
 #include "wx/intl.h"
 #include "wx/log.h"
 #include "wx/memory.h"
@@ -25,7 +24,7 @@
 
 #include "unistd.h"
 
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 #include "../gdk_imlib/gdk_imlib.h"
 #endif
 
@@ -33,7 +32,7 @@
 // global data
 //-----------------------------------------------------------------------------
 
-wxApp *wxTheApp = NULL;
+wxApp *wxTheApp = (wxApp *)  NULL;
 wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 extern wxList wxPendingDelete;
@@ -80,8 +79,9 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 wxApp::wxApp()
 {
   m_idleTag = 0;
-  m_topWindow = NULL;
+  m_topWindow = (wxWindow *) NULL;
   m_exitOnFrameDelete = TRUE;
+  wxTheApp = this;
 }
 
 wxApp::~wxApp(void)
@@ -95,14 +95,14 @@ bool wxApp::OnInit(void)
 }
 
 bool wxApp::OnInitGui(void)
-{ 
+{
   m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL );
-  return TRUE; 
+  return TRUE;
 }
 
-int wxApp::OnRun(void) 
-{ 
-  return MainLoop(); 
+int wxApp::OnRun(void)
+{
+  return MainLoop();
 }
 
 bool wxApp::ProcessIdle(void)
@@ -110,7 +110,7 @@ bool wxApp::ProcessIdle(void)
   wxIdleEvent event;
   event.SetEventObject( this );
   ProcessEvent( event );
-  
+
   return event.MoreRequested();
 }
 
@@ -200,12 +200,12 @@ bool wxApp::Initialized(void)
   return m_initialized;
 }
 
-bool wxApp::Pending(void) 
+bool wxApp::Pending(void)
 {
   return FALSE;
 }
 
-void wxApp::Dispatch(void) 
+void wxApp::Dispatch(void)
 {
 }
 
@@ -215,7 +215,7 @@ void wxApp::DeletePendingObjects(void)
   while (node)
   {
     wxObject *obj = (wxObject *)node->Data();
-    
+
     delete obj;
 
     if (wxPendingDelete.Member(obj))
@@ -229,7 +229,7 @@ wxWindow *wxApp::GetTopWindow(void)
 {
   if (m_topWindow) return m_topWindow;
   wxNode *node = wxTopLevelWindows.First();
-  if (!node) return NULL;
+  if (!node) return (wxWindow *) NULL;
   return (wxWindow*)node->Data();
 }
 
@@ -242,7 +242,7 @@ void wxApp::CommonInit(void)
 {
 
 /*
-#if USE_RESOURCES
+#if wxUSE_RESOURCES
   (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
 #endif
 */
@@ -259,12 +259,14 @@ void wxApp::CommonInit(void)
   wxInitializeStockObjects();
 
   wxInitializeResourceSystem();
-  
+
   // For PostScript printing
-#if USE_POSTSCRIPT
+#if wxUSE_POSTSCRIPT
+/* Now done in wxPostScriptModule
   wxInitializePrintSetupData();
   wxThePrintPaperDatabase = new wxPrintPaperDatabase;
   wxThePrintPaperDatabase->CreateDatabase();
+ */
 #endif
 
 
@@ -278,11 +280,13 @@ void wxApp::CommonInit(void)
 void wxApp::CommonCleanUp(void)
 {
   wxDELETE(wxTheColourDatabase);
+/* Now done in wxPostScriptModule
   wxDELETE(wxThePrintPaperDatabase);
   wxDELETE(wxThePrintSetupData);
+ */
   wxDELETE(wxTheFontNameDirectory);
   wxDeleteStockObjects();
-  
+
   wxFlushResources();
 
   wxDELETE(wxTheResourceCache);
@@ -290,10 +294,10 @@ void wxApp::CommonCleanUp(void)
   wxDeleteStockLists();
 
   wxCleanUpResourceSystem();
-  
+
   wxSystemSettings::Done();
 }
-    
+
 wxLog *wxApp::CreateLogTarget()
 {
   return new wxLogGui;
@@ -308,55 +312,59 @@ int wxEntry( int argc, char *argv[] )
   wxBuffer = new char[BUFSIZ + 512];
 
   wxClassInfo::InitializeClasses();
-  
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
 
-#if !defined(_WINDLL)
+#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+
   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;
   }
-  
-  if (!wxTheApp) 
+
+  if (!wxTheApp)
   {
-    printf( _("wxWindows error: wxTheApp == NULL\n") );
+    printf( "wxWindows error: wxTheApp == NULL\n" );
     return 0;
   }
 
   wxTheApp->argc = argc;
   wxTheApp->argv = argv;
+
+  char name[200];
+  strcpy( name, argv[0] );
+  strcpy( name, wxFileNameFromPath(name) );
+  wxStripExtension( name );
+  wxTheApp->SetAppName( name );
+  
+  gtk_set_locale();
   
   gtk_init( &argc, &argv );
 
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 
   gdk_imlib_init();
-  
+
   gtk_widget_push_visual(gdk_imlib_get_visual());
-  
+
   gtk_widget_push_colormap(gdk_imlib_get_colormap());
-  
-#endif  
-    
+
+#endif
+
   wxApp::CommonInit();
 
   wxTheApp->OnInitGui();
@@ -364,28 +372,32 @@ int wxEntry( int argc, char *argv[] )
   // Here frames insert themselves automatically
   // into wxTopLevelWindows by getting created
   // in OnInit().
-  
+
   if (!wxTheApp->OnInit()) return 0;
 
   wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
-  
+
   int retValue = 0;
-  
+
   if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
-  
-  wxTheApp->DeletePendingObjects();  
-  
+
+  wxTheApp->DeletePendingObjects();
+
   wxTheApp->OnExit();
-  
+
   wxApp::CommonCleanUp();
 
   wxDELETE(wxTheApp);
+
+  wxLog *oldLog = wxLog::SetActiveTarget( NULL );
+  if (oldLog) delete oldLog;
+  
+  wxClassInfo::CleanUpClasses();
+  
+  delete[] wxBuffer;
+  
+#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
   
-#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");
@@ -393,8 +405,9 @@ int wxEntry( int argc, char *argv[] )
     wxDebugContext::PrintStatistics();
   }
   wxDebugContext::SetStream(NULL, NULL);
-#endif
   
+#endif
+
   return retValue;
 }
 
@@ -402,7 +415,7 @@ int wxEntry( int argc, char *argv[] )
 // main()
 //-----------------------------------------------------------------------------
 
-#if defined(AIX) || defined(AIX4) || defined(____HPUX__)
+#if defined(AIX) || defined(AIX4) || defined(____HPUX__) || defined(NOMAIN)
 
  // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h