Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index c9f166377f5dc95300caf10205f7233323d08b04..4d25eb73def0d8591edb22c7be25bf22ea9f32c2 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -136,9 +136,11 @@ bool wxApp::Yield(bool onlyIfNeeded)
     // never finish.
     wxTheApp->RemoveIdleTag();
 
+#if wxUSE_LOG
     // disable log flushing from here because a call to wxYield() shouldn't
     // normally result in message boxes popping up &c
     wxLog::Suspend();
+#endif
 
     while (gtk_events_pending())
         gtk_main_iteration();
@@ -151,8 +153,10 @@ bool wxApp::Yield(bool onlyIfNeeded)
     // return value of Processidle().
     ProcessIdle();
 
+#if wxUSE_LOG
     // let the logs be flashed again
     wxLog::Resume();
+#endif
 
     wxIsInsideYield = FALSE;
 
@@ -612,6 +616,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     // (1) this variable exists for the sole purpose of specifying the encoding
     //     of the filenames for GTK+ programs, so use it if it is set
     wxString encName(wxGetenv(_T("G_FILENAME_ENCODING")));
+    if (encName == _T("@locale"))
+        encName.clear();
     encName.MakeUpper();
 #if wxUSE_INTL        
     if (encName.empty())