Attachment 156545 Details for Bug 241925 – patch to compat-wxGTK26 to make this problem go away, sort of

[patch] patch to compat-wxGTK26 to make this problem go away, sort of

diff (text/plain), 1.33 KB, created by Jonathan Kamens on 2007-06-08 04:51:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Kamens

Created: 2007-06-08 04:51:28 UTC

Size: 1.33 KB

patch

obsolete

>--- app.cpp.old	2006-03-21 18:42:16.000000000 -0500
>+++ app.cpp	2007-06-07 22:44:27.000000000 -0400
>@@ -442,12 +442,26 @@
> 
>     m_idleTag = 0;
>     g_isIdle = TRUE;
>-    wxapp_install_idle_handler();
> 
> #if wxUSE_THREADS
>+    // 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))
>+    {
>+        printf( "wxWidgets warning: GUI threading disabled due to outdated GTK version\n" );
>+    }
>+    else
>+    {
>+        if (!g_thread_supported())
>+            g_thread_init(NULL);
>+    }
>+
>     g_main_set_poll_func( wxapp_poll_func );
> #endif
> 
>+    wxapp_install_idle_handler();
>+
>     m_colorCube = (unsigned char*) NULL;
> 
>     // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
>@@ -580,21 +594,6 @@
> {
>     bool init_result;
>     
>-#if wxUSE_THREADS
>-    // 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))
>-    {
>-        printf( "wxWidgets warning: GUI threading disabled due to outdated GTK version\n" );
>-    }
>-    else
>-    {
>-        if (!g_thread_supported())
>-            g_thread_init(NULL);
>-    }
>-#endif // wxUSE_THREADS
>-
>     gtk_set_locale();
> 
>     // We should have the wxUSE_WCHAR_T test on the _outside_

Actions: View | Diff

Attachments on bug 241925: 155908 | 156545