vsprintf() is ANSI so there is normally no need to test for it

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index fb0c54118ad9d753df4d5b8762942a71aed6d407..05395a5b4682c069ab043eb870afd6f9bbf97379 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -2,9 +2,8 @@
 // Name:        app.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -21,13 +20,10 @@
 #include "wx/font.h"
 #include "wx/settings.h"
 #include "wx/resource.h"
+#include "wx/module.h"
 
 #include "unistd.h"
 
-#ifdef wxUSE_GDK_IMLIB
-#include "../gdk_imlib/gdk_imlib.h"
-#endif
-
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
@@ -38,6 +34,74 @@ wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 extern wxList wxPendingDelete;
 extern wxResourceCache *wxTheResourceCache;
 
+unsigned char g_palette[64*3] =
+{
+  0x0,  0x0,  0x0,
+  0xff, 0xff, 0xff,
+  0xff, 0x0,  0x0,
+  0xff, 0xff, 0x0,
+  0x0,  0xff, 0x0,
+  0x0,  0x0,  0xff,
+  0x0,  0xff, 0xff,
+  0x99, 0x99, 0x99,
+  0xff, 0x88, 0x0,
+  0x88, 0x0,  0x0,
+  0x0,  0x88, 0x88,
+  0x88, 0x88, 0x0,
+  0xff, 0xcc, 0x97,
+  0xbb, 0xbb, 0xbb,
+  0x9f, 0x6b, 0x42,
+  0x55, 0x55, 0x55,
+  0xdd, 0xdd, 0xdd,
+  0x77, 0x77, 0x77,
+  0x33, 0x33, 0x33,
+  0xcc, 0x0,  0x0,
+  0xff, 0x44, 0x0,
+  0xff, 0xcc, 0x0,
+  0xcc, 0xcc, 0x0,
+  0x60, 0x60, 0x0,
+  0x0,  0x43, 0x0,
+  0x0,  0x7f, 0x0,
+  0x0,  0xcc, 0x0,
+  0x0,  0x44, 0x44,
+  0x0,  0x0,  0x44,
+  0x0,  0x0,  0x88,
+  0xef, 0xb1, 0x7b,
+  0xdf, 0x98, 0x5f,
+  0xbf, 0x87, 0x56,
+  0x7f, 0x57, 0x26,
+  0x5f, 0x39, 0xc,
+  0x3f, 0x1c, 0x0,
+  0x21, 0x0,  0x0,
+  0x0,  0x43, 0x87,
+  0x2d, 0x70, 0xaf,
+  0x5a, 0x9e, 0xd7,
+  0x87, 0xcc, 0xff,
+  0xff, 0xe0, 0xba,
+  0x21, 0x43, 0xf,
+  0x3d, 0x5d, 0x25,
+  0x59, 0x78, 0x3a,
+  0x75, 0x93, 0x4f,
+  0x91, 0xae, 0x64,
+  0xad, 0xc8, 0x7a,
+  0xf0, 0xa8, 0xef, 
+  0xd0, 0x88, 0xd0,
+  0xaf, 0x66, 0xaf,
+  0x8e, 0x44, 0x8e,
+  0x6d, 0x22, 0x6d,
+  0x4b, 0x0,  0x4b, 
+  0xff, 0xc0, 0xbc,
+  0xff, 0x93, 0x91,
+  0xff, 0x66, 0x67,
+  0xd8, 0xf2, 0xbf,
+  0xff, 0xc9, 0x68,
+  0xff, 0x96, 0x67,
+  0xa5, 0x60, 0xff,
+  0x51, 0xff, 0x99,
+  0x3f, 0xa5, 0x63,
+  0x98, 0x90, 0x67
+};
+
 //-----------------------------------------------------------------------------
 // local functions
 //-----------------------------------------------------------------------------
@@ -260,30 +324,14 @@ void wxApp::CommonInit(void)
 
   wxInitializeResourceSystem();
 
-  // For PostScript printing
-#if wxUSE_POSTSCRIPT
-/* Now done in wxPostScriptModule
-  wxInitializePrintSetupData();
-  wxThePrintPaperDatabase = new wxPrintPaperDatabase;
-  wxThePrintPaperDatabase->CreateDatabase();
- */
-#endif
-
-
-/*
-  wxBitmap::InitStandardHandlers();
-
-  g_globalCursor = new wxCursor;
-*/
+  wxImage::InitStandardHandlers();
+  
+//  g_globalCursor = new wxCursor;
 }
 
 void wxApp::CommonCleanUp(void)
 {
   wxDELETE(wxTheColourDatabase);
-/* Now done in wxPostScriptModule
-  wxDELETE(wxThePrintPaperDatabase);
-  wxDELETE(wxThePrintSetupData);
- */
   wxDELETE(wxTheFontNameDirectory);
   wxDeleteStockObjects();
 
@@ -294,6 +342,8 @@ void wxApp::CommonCleanUp(void)
   wxDeleteStockLists();
 
   wxCleanUpResourceSystem();
+  
+  wxImage::CleanUpHandlers();
 
   wxSystemSettings::Done();
 }
@@ -313,13 +363,14 @@ int wxEntry( int argc, char *argv[] )
 
   wxClassInfo::InitializeClasses();
 
-#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+  /* Debug stream 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);
-
 #endif
+*/
 
   if (!wxTheApp)
   {
@@ -355,18 +406,28 @@ int wxEntry( int argc, char *argv[] )
   
   gtk_init( &argc, &argv );
 
-#ifdef wxUSE_GDK_IMLIB
-
-  gdk_imlib_init();
+  GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );
 
-  gtk_widget_push_visual(gdk_imlib_get_visual());
-
-  gtk_widget_push_colormap(gdk_imlib_get_colormap());
-
-#endif
+  for (int i = 0; i < 64; i++)
+  {
+    GdkColor col;
+    col.red    = g_palette[i*3 + 0] << 8;
+    col.green  = g_palette[i*3 + 1] << 8;
+    col.blue   = g_palette[i*3 + 2] << 8;
+    col.pixel  = 0;
+    
+    gdk_color_alloc( cmap, &col );
+  }
+  
+  gtk_widget_push_colormap( cmap );
+  
+  gtk_widget_set_default_colormap( cmap );
 
   wxApp::CommonInit();
 
+  wxModule::RegisterModules();
+  if (!wxModule::InitializeModules()) return FALSE;
+    
   wxTheApp->OnInitGui();
 
   // Here frames insert themselves automatically
@@ -385,29 +446,32 @@ int wxEntry( int argc, char *argv[] )
 
   wxTheApp->OnExit();
 
+  wxModule::CleanUpModules();
+  
   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 (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
   
   if (wxDebugContext::CountObjectsLeft() > 0)
   {
-    wxTrace("There were memory leaks.\n");
+    wxLogDebug("There were memory leaks.\n");
     wxDebugContext::Dump();
     wxDebugContext::PrintStatistics();
   }
-  wxDebugContext::SetStream(NULL, NULL);
+//  wxDebugContext::SetStream(NULL, NULL);
   
 #endif
 
+  wxLog *oldLog = wxLog::SetActiveTarget( NULL );
+  if (oldLog) delete oldLog;
+
+
   return retValue;
 }