X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1601ab7a280b35b6829b8b353942f872b1d1a772..f2fe5464d6c8d178aa5733cf078ed5988ec90721:/src/gtk/app.cpp

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index d59cb98ded..85b8b53fb6 100644
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -213,7 +213,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 +250,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 +276,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;
@@ -343,7 +343,7 @@ bool wxApp::OnInitGui()
                 int index = -1;
 
                 GdkColor *colors = cmap->colors;
-                if(colors)
+                if (colors)
                 {
                     int max = 3 * 65536;
 
@@ -359,7 +359,16 @@ bool wxApp::OnInitGui()
                         }
                     }
                 }
-
+		else
+		{
+		    /* 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;
+		}
+		
                 m_colorCube[ (r*1024) + (g*32) + b ] = index;
             }
         }
@@ -397,9 +406,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();
@@ -626,6 +637,7 @@ void wxApp::CleanUp()
     }
 #endif // Debug
 
+#if wxUSE_LOG
     // do this as the very last thing because everything else can log messages
     wxLog::DontCreateOnDemand();
 
@@ -638,6 +650,7 @@ wxLog *wxApp::CreateLogTarget()
 {
     return new wxLogGui;
 }
+#endif // wxUSE_LOG
 
 //-----------------------------------------------------------------------------
 // wxEntry
@@ -690,31 +703,38 @@ int wxEntry( int argc, char *argv[] )
 
     if ( retValue == 0 )
     {
+        /* delete pending toplevel windows (typically a single
+	   dialog) so that, if there isn't any left, we don't
+	   call OnRun() */
+        wxTheApp->DeletePendingObjects();
+	
         wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
 
         if (wxTheApp->Initialized())
+	{
             retValue = wxTheApp->OnRun();
 
-        wxWindow *topWindow = wxTheApp->GetTopWindow();
-        if (topWindow)
-        {
-            // Forcibly delete the window.
-            if (topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
-                topWindow->IsKindOf(CLASSINFO(wxDialog)) )
+            wxWindow *topWindow = wxTheApp->GetTopWindow();
+            if (topWindow)
             {
-                topWindow->Close( TRUE );
-                wxTheApp->DeletePendingObjects();
-            }
-            else
-            {
-                delete topWindow;
-                wxTheApp->SetTopWindow( (wxWindow*) NULL );
-            }
+                /* Forcibly delete the window. */
+                if (topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
+                    topWindow->IsKindOf(CLASSINFO(wxDialog)) )
+                {
+                    topWindow->Close( TRUE );
+                    wxTheApp->DeletePendingObjects();
+                }
+                else
+                {
+                    delete topWindow;
+                    wxTheApp->SetTopWindow( (wxWindow*) NULL );
+                }
+	    }
+            wxTheApp->OnExit();
         }
-
-        wxTheApp->OnExit();
     }
 
+#if wxUSE_LOG
     // flush the logged messages if any
     wxLog *log = wxLog::GetActiveTarget();
     if (log != NULL && log->HasPendingMessages())
@@ -726,6 +746,7 @@ int wxEntry( int argc, char *argv[] )
     wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr);
     if ( oldlog )
         delete oldlog;
+#endif // wxUSE_LOG
 
     wxApp::CleanUp();