fixed memory leak in Accept()

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 680bbce0f0b1d91ac3bf956ac82573e5ee867897..e29797d061470572dbe7d4d4f45f64411b7754dd 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -82,6 +82,14 @@ void wxExit()
 
 bool wxYield()
 {
+#if wxUSE_THREADS
+    if ( !wxThread::IsMain() )
+    {
+        // can't call gtk_main_iteration() from other threads like this
+        return TRUE;
+    }
+#endif // wxUSE_THREADS
+
 #ifdef __WXDEBUG__
     static bool s_inYield = FALSE;
     
@@ -630,11 +638,14 @@ int wxEntryStart( int argc, char *argv[] )
 
     gtk_set_locale();
 
+    // We should have the wxUSE_WCHAR_T test on the _outside_
+#if wxUSE_WCHAR_T
 #if defined(__WXGTK20__)
     // gtk+ 2.0 supports Unicode through UTF-8 strings
     wxConvCurrent = &wxConvUTF8;
-#elif wxUSE_WCHAR_T
+#else
     if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
+#endif
 #else
     if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
 #endif
@@ -654,7 +665,6 @@ int wxEntryStart( int argc, char *argv[] )
     return 0;
 }
 
-
 int wxEntryInitGui()
 {
     int retValue = 0;