better fix for infinite loop in HandleOnNavigationKey() when wxUSE_STL==1 and start_n...

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index aaf7989b30b50199a5cd207952e93bcd60155278..8255d6178cc6de324b6e2f31557493a88100b1cd 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -73,7 +73,7 @@
 #endif // HAVE_POLL/!HAVE_POLL
 
 #include "wx/unix/private.h"
-#include "wx/gtk/win_gtk.h"
+#include "wx/gtk1/win_gtk.h"
 
 #include <gtk/gtk.h>
 
@@ -173,21 +173,17 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
 void wxApp::WakeUpIdle()
 {
-#ifndef __WXGTK20__
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiEnter();
 #endif // wxUSE_THREADS_
-#endif // __WXGTK2__
 
     wxapp_install_idle_handler();
 
-#ifndef __WXGTK20__
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiLeave();
 #endif // wxUSE_THREADS_
-#endif // __WXGTK2__
 }
 
 //-----------------------------------------------------------------------------
@@ -245,11 +241,7 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
         if (wxTopLevelWindows.GetCount() > 0)
         {
             wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData();
-#ifdef __WXGTK20__
-            if (win->IsKindOf(CLASSINFO(wxMessageDialog)))
-#else
             if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog)))
-#endif
                 win->OnInternalIdle();
         }
         return TRUE;
@@ -469,14 +461,9 @@ bool wxApp::OnInitGui()
     // chosen a specific visual, then derive the GdkVisual from that
     if (m_glVisualInfo != NULL)
     {
-#ifdef __WXGTK20__
-        // seems gtk_widget_set_default_visual no longer exists?
-        GdkVisual* vis = gtk_widget_get_default_visual();
-#else
         GdkVisual* vis = gdkx_visual_get(
             ((XVisualInfo *) m_glVisualInfo) ->visualid );
         gtk_widget_set_default_visual( vis );
-#endif
 
         GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
         gtk_widget_set_default_colormap( colormap );
@@ -490,13 +477,8 @@ bool wxApp::OnInitGui()
     else
     if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual))
     {
-#ifdef __WXGTK20__
-        /* seems gtk_widget_set_default_visual no longer exists? */
-        GdkVisual* vis = gtk_widget_get_default_visual();
-#else
         GdkVisual* vis = gdk_visual_get_best();
         gtk_widget_set_default_visual( vis );
-#endif
 
         GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
         gtk_widget_set_default_colormap( colormap );
@@ -575,7 +557,7 @@ GdkVisual *wxApp::GetGdkVisual()
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
     bool init_result;
-    
+
 #if wxUSE_THREADS
     // GTK 1.2 up to version 1.2.3 has broken threads
     if ((gtk_major_version == 1) &&
@@ -595,47 +577,13 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
     // 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;
-    #else // GTK 1.x
         if (!wxOKlibc())
             wxConvCurrent = &wxConvLocal;
-    #endif
 #else // !wxUSE_WCHAR_T
     if (!wxOKlibc())
         wxConvCurrent = (wxMBConv*) NULL;
 #endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
 
-#ifdef __WXGTK20__
-    // 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")));
-    encName = encName.BeforeFirst(_T(','));
-    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
     int i;
@@ -648,7 +596,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     argvGTK[argc] = NULL;
 
     int argcGTK = argc;
-    
+
 #ifdef __WXGPE__
     init_result = true;  // is there a _check() version of this?
     gpe_application_init( &argcGTK, &argvGTK );
@@ -688,7 +636,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?"));
         return false;
     }
-    
+
     // we can not enter threads before gtk_init is done
     gdk_threads_enter();