OnExit() is called for modules which were initialized even if the init of

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 87715dd428fe3dec8e381d5ec8da03d8d1ca7dd1..65db013776399ddf9d43cd98331f71c5ea70c545 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -19,13 +19,14 @@
 #include "wx/memory.h"
 #include "wx/font.h"
 #include "wx/settings.h"
-#ifdef wxUSE_WX_RESOURCES
+#if wxUSE_WX_RESOURCES
 #include "wx/resource.h"
 #endif
 #include "wx/module.h"
 #include "wx/image.h"
+#if wxUSE_THREADS
 #include "wx/thread.h"
-
+#endif
 #include "unistd.h"
 
 #include "glib.h"
@@ -145,9 +146,13 @@ END_EVENT_TABLE()
 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
     if (wxTheApp) while (wxTheApp->ProcessIdle()) {}
+#if wxUSE_THREADS
     wxMutexGuiLeave();
+#endif
     usleep(10000);
+#if wxUSE_THREADS
     wxMutexGuiEnter();
+#endif
     return TRUE;
 }
 
@@ -156,22 +161,93 @@ wxApp::wxApp()
     m_idleTag = 0;
     m_topWindow = (wxWindow *) NULL;
     m_exitOnFrameDelete = TRUE;
+    m_colorCube = (unsigned char*) NULL;
     wxTheApp = this;
 }
 
 wxApp::~wxApp(void)
 {
     gtk_idle_remove( m_idleTag );
+    
+    if (m_colorCube) free(m_colorCube);
 }
 
-bool wxApp::OnInit(void)
+bool wxApp::InitVisual()
 {
+    /* Nothing to do for 15, 16, 24, 32 bit displays */
+
+    GdkVisual *visual = gdk_visual_get_system();
+    if (visual->depth > 8) return TRUE;
+
+    /* this initiates the standard palette as defined by GdkImlib
+       in the GNOME libraries. it ensures that all GNOME applications
+       use the same 64 colormap entries on 8-bit displays so you
+       can use several rather graphics-heavy applications at the
+       same time */
+    
+    /*
+    GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );
+
+    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_set_default_colormap( cmap );
+    */
+    
+    /* initialize color cube for 8-bit color reduction dithering */
+    
+    GdkColormap *cmap = gtk_widget_get_default_colormap();
+    
+    m_colorCube = (unsigned char*)malloc(32 * 32 * 32);
+
+     for (int r = 0; r < 32; r++)
+     {
+       for (int g = 0; g < 32; g++)
+       {
+           for (int b = 0; b < 32; b++)
+           {
+               int rr = (r << 3) | (r >> 2);
+               int gg = (g << 3) | (g >> 2);
+               int bb = (b << 3) | (b >> 2);
+               
+                GdkColor *colors = cmap->colors;
+                int max = 3 * (65536);
+                int index = -1;
+
+                for (int i = 0; i < cmap->size; i++)
+                {
+                    int rdiff = ((rr << 8) - colors[i].red);
+                    int gdiff = ((gg << 8)- colors[i].green);
+                    int bdiff = ((bb << 8)- colors[i].blue);
+                    int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
+                    if (sum < max) { index = i; max = sum; }
+                }
+               
+               m_colorCube[ (r*1024) + (g*32) + b ] = index;
+           }
+       }
+    }
+    
     return TRUE;
 }
 
 bool wxApp::OnInitGui(void)
 {
     m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL );
+    
+    return TRUE;
+}
+
+bool wxApp::OnInit(void)
+{
     return TRUE;
 }
 
@@ -315,12 +391,6 @@ void wxApp::SetTopWindow( wxWindow *win )
 
 void wxApp::CommonInit(void)
 {
-
-/*
-#if wxUSE_RESOURCES
-  (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
-#endif
-*/
   wxSystemSettings::Init();
   
   wxTheFontNameDirectory =  new wxFontNameDirectory;
@@ -332,7 +402,7 @@ void wxApp::CommonInit(void)
   wxInitializeStockLists();
   wxInitializeStockObjects();
 
-#ifdef wxUSE_WX_RESOURCES
+#if wxUSE_WX_RESOURCES
   wxTheResourceCache = new wxResourceCache(wxKEY_STRING);
   
   wxInitializeResourceSystem();
@@ -345,14 +415,19 @@ void wxApp::CommonInit(void)
 
 void wxApp::CommonCleanUp(void)
 {
-    wxDELETE(wxTheColourDatabase);
-    wxDELETE(wxTheFontNameDirectory);
+    if (wxTheColourDatabase) delete wxTheColourDatabase;
+    wxTheColourDatabase = (wxColourDatabase*) NULL;
+    
+    if (wxTheFontNameDirectory) delete wxTheFontNameDirectory;
+    wxTheFontNameDirectory = (wxFontNameDirectory*) NULL;
+    
     wxDeleteStockObjects();
 
-#ifdef wxUSE_WX_RESOURCES
+#if wxUSE_WX_RESOURCES
     wxFlushResources();
 
-    wxDELETE(wxTheResourceCache);
+    if (wxTheResourceCache) delete wxTheResourceCache;
+    wxTheResourceCache = (wxResourceCache*) NULL;
     
     wxCleanUpResourceSystem();
 #endif
@@ -414,30 +489,15 @@ int wxEntry( int argc, char *argv[] )
 
     gtk_init( &argc, &argv );
 
-    GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );
-
-    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 );
+    if (!wxTheApp->InitVisual()) return 0;
 
     wxApp::CommonInit();
 
+    if (!wxTheApp->OnInitGui()) return 0;
+
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;
-
-    wxTheApp->OnInitGui();
-
+    
     // Here frames insert themselves automatically
     // into wxTopLevelWindows by getting created
     // in OnInit().
@@ -476,11 +536,9 @@ int wxEntry( int argc, char *argv[] )
 
 #endif
 
-    wxLog *oldLog = wxLog::SetActiveTarget( NULL );
+    wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
     if (oldLog) delete oldLog;
 
     return retValue;
 }
 
-//-----------------------------------------------------------------------------
-