X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b90a8f20dd9c1a478f755941795158c38230a80..0c0890656219df340e90c8f3ba230c50490096aa:/src/gtk/app.cpp

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index bf7a03b90e..a6b21a616b 100644
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -143,6 +143,9 @@ bool wxYield()
     /* it's necessary to call ProcessIdle() to update the frames sizes which
        might have been changed (it also will update other things set from
        OnUpdateUI() which is a nice (and desired) side effect) */
+    while (wxTheApp->ProcessIdle()) { }
+       
+#if 0
     for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
           node;
           node = node->GetNext() )
@@ -150,6 +153,7 @@ bool wxYield()
         wxWindow *win = node->GetData();
         win->OnInternalIdle();
     }
+#endif
 
     if (wxTheApp->m_idleTag)
     {
@@ -177,10 +181,12 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
     if (!wxTheApp) return TRUE;
     
+#if (GTK_MINOR_VERSION > 0)
     /* when getting called from GDK's idle handler we
        are no longer within GDK's grab on the GUI
        thread so we must lock it here ourselves */
     GDK_THREADS_ENTER ();
+#endif
     
     /* sent idle event to all who request them */
     while (wxTheApp->ProcessIdle()) { }
@@ -197,8 +203,10 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
        emptied */
     g_isIdle = TRUE;
     
+#if (GTK_MINOR_VERSION > 0)
     /* release lock again */
     GDK_THREADS_LEAVE ();
+#endif
 
     return TRUE;
 }
@@ -215,16 +223,18 @@ void wxapp_install_idle_handler()
     g_isIdle = FALSE;
 }
 
-
+#if wxUSE_THREADS
 static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
 {
     gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag );
     wxTheApp->m_wakeUpTimerTag = 0;
     
+#if (GTK_MINOR_VERSION > 0)
     /* when getting called from GDK's time-out handler 
        we are no longer within GDK's grab on the GUI
        thread so we must lock it here ourselves */
     GDK_THREADS_ENTER ();
+#endif
     
     /* unblock other threads wishing to do some GUI things */
     wxMutexGuiLeave();
@@ -235,13 +245,16 @@ static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
     /* block other thread again  */
     wxMutexGuiEnter();
     
+#if (GTK_MINOR_VERSION > 0)
     /* release lock again */
     GDK_THREADS_LEAVE ();
+#endif
     
     wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 10, wxapp_wakeup_timerout_callback, (gpointer) NULL );
     
     return TRUE;
 }
+#endif
 
 //-----------------------------------------------------------------------------
 // wxApp
@@ -262,7 +275,9 @@ 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 );
+#endif
 
     m_colorCube = (unsigned char*) NULL;
 }
@@ -271,7 +286,9 @@ wxApp::~wxApp()
 {
     if (m_idleTag) gtk_idle_remove( m_idleTag );
 
+#if wxUSE_THREADS
     if (m_wakeUpTimerTag) gtk_timeout_remove( m_wakeUpTimerTag );
+#endif
     
     if (m_colorCube) free(m_colorCube);
 }
@@ -326,7 +343,7 @@ bool wxApp::OnInitGui()
                 int index = -1;
 
                 GdkColor *colors = cmap->colors;
-                if(colors)
+                if (colors)
                 {
                     int max = 3 * 65536;
 
@@ -342,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;
             }
         }
@@ -673,29 +699,35 @@ 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();
     }
 
     // flush the logged messages if any