[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index dbe83542dc3e0aff07d0cc5960b7df556d4690f5..4d25eb73def0d8591edb22c7be25bf22ea9f32c2 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -136,9 +136,11 @@ bool wxApp::Yield(bool onlyIfNeeded)
     // never finish.
     wxTheApp->RemoveIdleTag();
 
     // 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();
     // 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();
 
     while (gtk_events_pending())
         gtk_main_iteration();


@@ -151,8 +153,10 @@ bool wxApp::Yield(bool onlyIfNeeded)
     // return value of Processidle().
     ProcessIdle();
 
     // return value of Processidle().
     ProcessIdle();
 

+#if wxUSE_LOG

     // let the logs be flashed again
     wxLog::Resume();
     // let the logs be flashed again
     wxLog::Resume();

+#endif

 
     wxIsInsideYield = FALSE;
 
 
     wxIsInsideYield = FALSE;
 


@@ -607,10 +611,32 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 #endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
 
 #ifdef __WXGTK20__
 #endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
 
 #ifdef __WXGTK20__

-    m_convBrokenFileNames = new wxConvBrokenFileNames;
-    m_oldConvFileName = wxConvFileName;
-    wxConvFileName = m_convBrokenFileNames;
-#endif
+    // decide which conversion to use for the file names
+
+    // (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())
+    {
+        // (2) if a non default locale is set, assume that the user wants his
+        //     filenames in this locale too
+        encName = wxLocale::GetSystemEncodingName().Upper();
+        // (3) finally use UTF-8 by default
+        if (encName.empty() || encName == _T("US-ASCII"))
+            encName = _T("UTF-8");
+        wxSetEnv(_T("G_FILENAME_ENCODING"), encName);
+    }
+#else
+    if (encName.empty())
+        encName = _T("UTF-8");
+#endif // wxUSE_INTL
+    static wxConvBrokenFileNames fileconv(encName);
+    wxConvFileName = &fileconv;
+#endif // __WXGTK20__

 
 #if wxUSE_UNICODE
     // gtk_init() wants UTF-8, not wchar_t, so convert
 
 #if wxUSE_UNICODE
     // gtk_init() wants UTF-8, not wchar_t, so convert


@@ -686,11 +712,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
 void wxApp::CleanUp()
 {
 
 void wxApp::CleanUp()
 {

-#ifdef __WXGTK20__
-    delete m_convBrokenFileNames;
-    wxConvFileName = m_oldConvFileName;
-#endif
-

     gdk_threads_leave();
 
     wxAppBase::CleanUp();
     gdk_threads_leave();
 
     wxAppBase::CleanUp();