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 dec83867a09766dfb70044a0bd1c1faffbc6e1cb..65db013776399ddf9d43cd98331f71c5ea70c545 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -44,9 +44,6 @@ wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 extern wxList wxPendingDelete;
 extern wxResourceCache *wxTheResourceCache;
 
-GdkVisual *wxVisualSetByExternal = (GdkVisual*) NULL;
-GdkColormap *wxColormapSetByExternal = (GdkColormap*) NULL;
-
 unsigned char g_palette[64*3] =
 {
   0x0,  0x0,  0x0,
@@ -164,54 +161,79 @@ 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::InitVisual()
 {
-    if (wxVisualSetByExternal)
-    {
-        /* this happens in the wxModule code of the OpenGl canvas. 
-          it chooses the best display for OpenGl and stores it 
-          in wxDisplaySetByExternal. we then have to make it the
-          default for the system */
-          
-       gtk_widget_set_default_visual( wxVisualSetByExternal );
-    }
-    
-    if (wxColormapSetByExternal)
-    {
-        /* OpenGl also gives us a colormap */
-       
-       gtk_widget_set_default_colormap( wxColormapSetByExternal );
-    }
-    else
-    {
-        /* 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 */
+    /* 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 );
+    /*
+    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;
+    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 );
-        }
+        gdk_color_alloc( cmap, &col );
+    }
        
-        gtk_widget_set_default_colormap( cmap );
+    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;
@@ -467,15 +489,15 @@ int wxEntry( int argc, char *argv[] )
 
     gtk_init( &argc, &argv );
 
-    wxModule::RegisterModules();
-    if (!wxModule::InitializeModules()) return FALSE;
-    
     if (!wxTheApp->InitVisual()) return 0;
 
     wxApp::CommonInit();
 
     if (!wxTheApp->OnInitGui()) return 0;
 
+    wxModule::RegisterModules();
+    if (!wxModule::InitializeModules()) return FALSE;
+    
     // Here frames insert themselves automatically
     // into wxTopLevelWindows by getting created
     // in OnInit().