Totally rewritten TreeCtrl for GTK...

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index dbe4a42999a4d52ec8ca4939a57cd7fd05421ce1..501e62597799623320d0ee86cf34880bde0f7130 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -25,7 +25,7 @@
 
 #include "unistd.h"
 
 
 #include "unistd.h"
 

-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB

 #include "../gdk_imlib/gdk_imlib.h"
 #endif
 
 #include "../gdk_imlib/gdk_imlib.h"
 #endif
 


@@ -243,7 +243,7 @@ void wxApp::CommonInit(void)
 {
 
 /*
 {
 
 /*

-#if USE_RESOURCES
+#if wxUSE_RESOURCES

   (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
 #endif
 */
   (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
 #endif
 */


@@ -262,7 +262,7 @@ void wxApp::CommonInit(void)
   wxInitializeResourceSystem();
 
   // For PostScript printing
   wxInitializeResourceSystem();
 
   // For PostScript printing

-#if USE_POSTSCRIPT
+#if wxUSE_POSTSCRIPT

   wxInitializePrintSetupData();
   wxThePrintPaperDatabase = new wxPrintPaperDatabase;
   wxThePrintPaperDatabase->CreateDatabase();
   wxInitializePrintSetupData();
   wxThePrintPaperDatabase = new wxPrintPaperDatabase;
   wxThePrintPaperDatabase->CreateDatabase();


@@ -310,13 +310,9 @@ int wxEntry( int argc, char *argv[] )
 
   wxClassInfo::InitializeClasses();
 
 
   wxClassInfo::InitializeClasses();
 

-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT

 
 

-#if !defined(_WINDLL)

   streambuf* sBuf = new wxDebugStreamBuf;
   streambuf* sBuf = new wxDebugStreamBuf;

-#else
-  streambuf* sBuf = NULL;
-#endif

   ostream* oStr = new ostream(sBuf) ;
   wxDebugContext::SetStream(oStr, sBuf);
 
   ostream* oStr = new ostream(sBuf) ;
   wxDebugContext::SetStream(oStr, sBuf);
 


@@ -346,11 +342,17 @@ int wxEntry( int argc, char *argv[] )
   wxTheApp->argc = argc;
   wxTheApp->argv = argv;
 
   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 );
 
   gtk_set_locale();
   
   gtk_init( &argc, &argv );
 

-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB

 
   gdk_imlib_init();
 
 
   gdk_imlib_init();
 


@@ -384,11 +386,15 @@ int wxEntry( int argc, char *argv[] )
 
   wxDELETE(wxTheApp);
 
 
   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.
+  wxLog *oldLog = wxLog::SetActiveTarget( NULL );
+  if (oldLog) delete oldLog;
+  
+  wxClassInfo::CleanUpClasses();
+  
+  delete[] wxBuffer;
+  
+#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+  

   if (wxDebugContext::CountObjectsLeft() > 0)
   {
     wxTrace("There were memory leaks.\n");
   if (wxDebugContext::CountObjectsLeft() > 0)
   {
     wxTrace("There were memory leaks.\n");


@@ -396,6 +402,7 @@ int wxEntry( int argc, char *argv[] )
     wxDebugContext::PrintStatistics();
   }
   wxDebugContext::SetStream(NULL, NULL);
     wxDebugContext::PrintStatistics();
   }
   wxDebugContext::SetStream(NULL, NULL);

+  

 #endif
 
   return retValue;
 #endif
 
   return retValue;