[ 1603286 ] make wxMessageDialog Gnome HIG conform for yes_no+cancel

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 3f6f2920c5a4b3a79073360ae7c7a577231512d5..d78d893db2d4ab665c181dea535849f02c726617 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -281,7 +281,7 @@ int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout)
     unsigned int i;
     for ( i = 0; i < nfds; i++ )
     {
-        wxASSERT_MSG( ufds[i].fd < wxFD_SETSIZE, _T("fd out of range") );
+        wxASSERT_MSG( ufds[i].fd < FD_SETSIZE, _T("fd out of range") );
 
         if ( ufds[i].events & G_IO_IN )
             wxFD_SET(ufds[i].fd, &readfds);
@@ -344,6 +344,9 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
 
 void wxapp_install_idle_handler()
 {
+    if (wxTheApp == NULL)
+        return;
+
 #if wxUSE_THREADS
     wxMutexLocker lock(gs_idleTagsMutex);
 #endif
@@ -428,24 +431,38 @@ bool wxApp::OnInitGui()
     // chosen a specific visual, then derive the GdkVisual from that
     if (m_glVisualInfo != NULL)
     {
-        // seems gtk_widget_set_default_visual no longer exists?
         GdkVisual* vis = gtk_widget_get_default_visual();
 
         GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
         gtk_widget_set_default_colormap( colormap );
     }
-
-    // On some machines, the default visual is just 256 colours, so
-    // we make sure we get the best. This can sometimes be wasteful.
-
     else
-    if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual))
     {
-        /* seems gtk_widget_set_default_visual no longer exists? */
-        GdkVisual* vis = gtk_widget_get_default_visual();
-
-        GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
-        gtk_widget_set_default_colormap( colormap );
+        // On some machines, the default visual is just 256 colours, so
+        // we make sure we get the best. This can sometimes be wasteful.
+        if (m_useBestVisual)
+        {
+            if (m_forceTrueColour)
+            {
+                GdkVisual* visual = gdk_visual_get_best_with_both( 24, GDK_VISUAL_TRUE_COLOR );
+                if (!visual)
+                {
+                    wxLogError(wxT("Unable to initialize TrueColor visual."));
+                    return false;
+                }
+                GdkColormap *colormap = gdk_colormap_new( visual, FALSE );
+                gtk_widget_set_default_colormap( colormap );
+            }
+            else
+            {
+                if (gdk_visual_get_best() != gdk_visual_get_system())
+                {
+                    GdkVisual* visual = gdk_visual_get_best();
+                    GdkColormap *colormap = gdk_colormap_new( visual, FALSE );
+                    gtk_widget_set_default_colormap( colormap );
+                }
+            }
+        }
     }
 
     return true;