X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca26177c3093ba7b4e66a4ced6e34041a263411d..92049cd473c81fbce934e71796b2d841d5e605fa:/src/gtk1/app.cpp

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index a6b21a616b..a733aede95 100644
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -28,13 +28,15 @@
 #include "wx/module.h"
 #include "wx/image.h"
 
+#if wxUSE_THREADS
 #include "wx/thread.h"
+#endif
 
 #include "unistd.h"
 
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 
 #include "wx/gtk/win_gtk.h"
 
@@ -213,7 +215,7 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 
 void wxapp_install_idle_handler()
 {
-    wxASSERT_MSG( wxTheApp->m_idleTag == 0, "attempt to install idle handler twice" );
+    wxASSERT_MSG( wxTheApp->m_idleTag == 0, _T("attempt to install idle handler twice") );
 
     /* this routine gets called by all event handlers
        indicating that the idle is over. */
@@ -250,7 +252,7 @@ static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
     GDK_THREADS_LEAVE ();
 #endif
     
-    wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 10, wxapp_wakeup_timerout_callback, (gpointer) NULL );
+    wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL );
     
     return TRUE;
 }
@@ -276,7 +278,7 @@ wxApp::wxApp()
     m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
     
 #if wxUSE_THREADS
-    m_wakeUpTimerTag = gtk_timeout_add( 10, wxapp_wakeup_timerout_callback, (gpointer) NULL );
+    m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL );
 #endif
 
     m_colorCube = (unsigned char*) NULL;
@@ -295,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
@@ -361,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;
             }
         }
@@ -406,9 +427,11 @@ void wxApp::OnIdle( wxIdleEvent &event )
     DeletePendingObjects();
 
     /* flush the logged messages if any */
+#if wxUSE_LOG
     wxLog *log = wxLog::GetActiveTarget();
     if (log != NULL && log->HasPendingMessages())
         log->Flush();
+#endif // wxUSE_LOG
 
     /* Send OnIdle events to all windows */
     bool needMore = SendIdleEvents();
@@ -571,9 +594,6 @@ bool wxApp::Initialize()
 
     wxImage::InitStandardHandlers();
 
-    /* no global cursor under X
-       g_globalCursor = new wxCursor; */
-
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;
 
@@ -635,6 +655,7 @@ void wxApp::CleanUp()
     }
 #endif // Debug
 
+#if wxUSE_LOG
     // do this as the very last thing because everything else can log messages
     wxLog::DontCreateOnDemand();
 
@@ -647,6 +668,7 @@ wxLog *wxApp::CreateLogTarget()
 {
     return new wxLogGui;
 }
+#endif // wxUSE_LOG
 
 //-----------------------------------------------------------------------------
 // wxEntry
@@ -656,6 +678,8 @@ int wxEntry( int argc, char *argv[] )
 {
     gtk_set_locale();
 
+    if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
+
     gtk_init( &argc, &argv );
 
     wxSetDetectableAutoRepeat( TRUE );
@@ -730,6 +754,7 @@ int wxEntry( int argc, char *argv[] )
         }
     }
 
+#if wxUSE_LOG
     // flush the logged messages if any
     wxLog *log = wxLog::GetActiveTarget();
     if (log != NULL && log->HasPendingMessages())
@@ -741,6 +766,7 @@ int wxEntry( int argc, char *argv[] )
     wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr);
     if ( oldlog )
         delete oldlog;
+#endif // wxUSE_LOG
 
     wxApp::CleanUp();