oops, fixed typo breaking iconv constness detection in the previous commit

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index daa4e27b35c0bdee775358aa3093577dad8bee4b..86a0258e1b51858cb529f629ab03edf4731d9da3 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -318,6 +318,20 @@ void wxapp_uninstall_thread_wakeup()
 
 #endif // wxUSE_THREADS
 
+//-----------------------------------------------------------------------------
+// Access to the root window global
+//-----------------------------------------------------------------------------
+
+GtkWidget* wxGetRootWindow()
+{
+    if (gs_RootWindow == NULL)
+    {
+        gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+        gtk_widget_realize( gs_RootWindow );
+    }
+    return gs_RootWindow;
+}
+
 //-----------------------------------------------------------------------------
 // wxApp
 //-----------------------------------------------------------------------------
@@ -369,9 +383,10 @@ bool wxApp::OnInitGui()
 
     // if this is a wxGLApp (derived from wxApp), and we've already
     // chosen a specific visual, then derive the GdkVisual from that
-    if (m_glVisualInfo != NULL) {
+    if (m_glVisualInfo != NULL)
+    {
 #ifdef __WXGTK20__
-        /* seems gtk_widget_set_default_visual no longer exists? */
+        // seems gtk_widget_set_default_visual no longer exists?
         GdkVisual* vis = gtk_widget_get_default_visual();
 #else
         GdkVisual* vis = gdkx_visual_get( 
@@ -385,12 +400,11 @@ bool wxApp::OnInitGui()
         visual = vis;
     }
     
-    /* 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? */
+    // 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))
+    else
+    if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual))
     {
 #ifdef __WXGTK20__
         /* seems gtk_widget_set_default_visual no longer exists? */
@@ -406,10 +420,10 @@ bool wxApp::OnInitGui()
         visual = vis;
     }
 
-    /* Nothing to do for 15, 16, 24, 32 bit displays */
+    // Nothing to do for 15, 16, 24, 32 bit displays
     if (visual->depth > 8) return TRUE;
 
-    /* initialize color cube for 8-bit color reduction dithering */
+    // initialize color cube for 8-bit color reduction dithering
 
     GdkColormap *cmap = gtk_widget_get_default_colormap();
 
@@ -446,16 +460,11 @@ bool wxApp::OnInitGui()
                 }
                 else
                 {
-#if (GTK_MINOR_VERSION > 0)
-                    /* assume 8-bit true or static colors. this really
-                       exists. */
+                    // 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( wxT("Unsupported graphics hardware") );
-#endif
                 }
                 m_colorCube[ (r*1024) + (g*32) + b ] = index;
             }
@@ -465,6 +474,20 @@ bool wxApp::OnInitGui()
     return TRUE;
 }
 
+GdkVisual *wxApp::GetGdkVisual()
+{
+    GdkVisual *visual = NULL;
+    
+    if (m_glVisualInfo)
+        visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
+    else
+        visual = gdk_window_get_visual( wxGetRootWindow()->window );
+        
+    wxASSERT( visual );
+    
+    return visual;
+}
+
 bool wxApp::ProcessIdle()
 {
     wxIdleEvent event;
@@ -669,19 +692,6 @@ void wxApp::CleanUp()
 #endif // wxUSE_LOG
 }
 
-//-----------------------------------------------------------------------------
-// Access to the root window global
-//-----------------------------------------------------------------------------
-
-GtkWidget* wxGetRootWindow()
-{
-    if (gs_RootWindow == NULL) {
-        gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
-        gtk_widget_realize( gs_RootWindow );
-    }
-    return gs_RootWindow;
-}
-
 //-----------------------------------------------------------------------------
 // wxEntry
 //-----------------------------------------------------------------------------
@@ -690,8 +700,8 @@ GtkWidget* wxGetRootWindow()
 int wxEntryStart( int& argc, char *argv[] )
 {
 #if wxUSE_THREADS
-    /* GTK 1.2 up to version 1.2.3 has broken threads */
-   if ((gtk_major_version == 1) &&
+    // GTK 1.2 up to version 1.2.3 has broken threads
+    if ((gtk_major_version == 1) &&
         (gtk_minor_version == 2) &&
         (gtk_micro_version < 4))
     {
@@ -768,7 +778,6 @@ void wxEntryCleanup()
 }
 
 
-
 int wxEntry( int argc, char *argv[] )
 {
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
@@ -868,11 +877,16 @@ int wxEntry( int argc, char *argv[] )
 
 #ifndef __WXUNIVERSAL__
 
+// XPM hack: make the arrays const
+#define static static const
+
 #include "wx/gtk/info.xpm"
 #include "wx/gtk/error.xpm"
 #include "wx/gtk/question.xpm"
 #include "wx/gtk/warning.xpm"
 
+#undef static
+
 wxIcon wxApp::GetStdIcon(int which) const
 {
     switch(which)