Option for variable line heights (MSW and GTK+ sofar)

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index c4315c64e6c3c74f2b3b548e29abb8ec6d5a5cb6..2041a588a7f8576b9b1fe29773ba7e1ec1ed1d6d 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -364,14 +364,8 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
     }
 #endif // wxUSE_THREADS
 
     }
 #endif // wxUSE_THREADS
 

-    // We should have the wxUSE_WCHAR_T test on the _outside_
-#if wxUSE_WCHAR_T

     // gtk+ 2.0 supports Unicode through UTF-8 strings
     wxConvCurrent = &wxConvUTF8;
     // gtk+ 2.0 supports Unicode through UTF-8 strings
     wxConvCurrent = &wxConvUTF8;

-#else // !wxUSE_WCHAR_T
-    if (!wxOKlibc())
-        wxConvCurrent = (wxMBConv*) NULL;
-#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T

 
     // decide which conversion to use for the file names
 
 
     // decide which conversion to use for the file names