X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae53c98c9f71acb0876846b9c5b1e56adfdb6186..c50f1fb9226d9260454ccb9c8a67d0be23c2827f:/src/gtk1/app.cpp

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 2b96d69033..a733aede95 100644
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -44,8 +44,6 @@
 // global data
 //-----------------------------------------------------------------------------
 
-extern wxCursor g_globalCursor;
-
 wxApp *wxTheApp = (wxApp *)  NULL;
 wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 
@@ -299,9 +297,25 @@ wxApp::~wxApp()
 
 bool wxApp::OnInitGui()
 {
-    /* Nothing to do for 15, 16, 24, 32 bit displays */
-
     GdkVisual *visual = gdk_visual_get_system();
+
+    /* on some machines, the default visual is just 256 colours, so 
+       we make sure we get the best. this can sometimes be wasteful,
+       of course, but what do these guys pay $30.000 for? */
+/*
+    if (gdk_visual_get_best() != gdk_visual_get_system())
+    {
+        GdkVisual* vis = gdk_visual_get_best();
+        gtk_widget_set_default_visual( vis );
+
+        GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
+        gtk_widget_set_default_colormap( colormap );
+	
+	visual = vis;
+    }
+*/
+    
+    /* Nothing to do for 15, 16, 24, 32 bit displays */
     if (visual->depth > 8) return TRUE;
 
         /* this initiates the standard palette as defined by GdkImlib
@@ -365,14 +379,17 @@ bool wxApp::OnInitGui()
                 }
 		else
 		{
+#if (GTK_MINOR_VERSION > 0)
 		    /* assume 8-bit true or static colors. this really
 		       exists. */
 		    GdkVisual* vis = gdk_colormap_get_visual( cmap );
 		    index = (r >> (5 - vis->red_prec)) << vis->red_shift;
 		    index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
 		    index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;
+#else
+                    wxFAIL_MSG( _T("Unsupported graphics hardware") );
+#endif
 		}
-		
                 m_colorCube[ (r*1024) + (g*32) + b ] = index;
             }
         }
@@ -577,8 +594,6 @@ bool wxApp::Initialize()
 
     wxImage::InitStandardHandlers();
 
-    g_globalCursor = wxCursor(wxCURSOR_DEFAULT);
-
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;