added wxAppTraits::SetLocale() and call it during wxApp initialization in all ports, not just wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -403,7 +403,8 @@ GdkVisual *wxApp::GetGdkVisual()
|
||||
|
||||
bool wxApp::Initialize(int& argc, wxChar **argv)
|
||||
{
|
||||
bool init_result;
|
||||
if ( !wxAppBase::Initialize(argc, argv) )
|
||||
return false;
|
||||
|
||||
#if wxUSE_THREADS
|
||||
if (!g_thread_supported())
|
||||
@@ -413,8 +414,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
|
||||
g_main_context_set_poll_func(NULL, wxapp_poll_func);
|
||||
#endif // wxUSE_THREADS
|
||||
|
||||
gtk_set_locale();
|
||||
|
||||
// We should have the wxUSE_WCHAR_T test on the _outside_
|
||||
#if wxUSE_WCHAR_T
|
||||
// gtk+ 2.0 supports Unicode through UTF-8 strings
|
||||
@@ -451,6 +450,9 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
|
||||
static wxConvBrokenFileNames fileconv(encName);
|
||||
wxConvFileName = &fileconv;
|
||||
|
||||
|
||||
bool init_result;
|
||||
|
||||
#if wxUSE_UNICODE
|
||||
// gtk_init() wants UTF-8, not wchar_t, so convert
|
||||
int i;
|
||||
@@ -507,13 +509,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
|
||||
// we can not enter threads before gtk_init is done
|
||||
gdk_threads_enter();
|
||||
|
||||
if ( !wxAppBase::Initialize(argc, argv) )
|
||||
{
|
||||
gdk_threads_leave();
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
wxSetDetectableAutoRepeat( true );
|
||||
|
||||
#if wxUSE_INTL
|
||||
|
Reference in New Issue
Block a user