Tried to fix GTK+ 2.0 compilos

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-02-13 12:10:54 +00:00
parent b742792c08
commit f9862abdc9
6 changed files with 13 additions and 6 deletions

View File

@@ -630,11 +630,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 +657,6 @@ int wxEntryStart( int argc, char *argv[] )
return 0;
}
int wxEntryInitGui()
{
int retValue = 0;