From 1452f1fbe37986f9cebdb2fc0a36167ac0e90f64 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 25 Nov 2011 19:27:19 +0000 Subject: [PATCH] Partially remove the Gtk/SCIM locale hack. Updates #1205, #1248. Originally committed to SVN as r5909. --- aegisub/src/frame_main.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index 996e8d788..d992b159f 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -104,15 +104,12 @@ FrameMain::FrameMain (wxArrayString args) StartupLog("Entering FrameMain constructor"); #ifdef __WXGTK__ -/* XXX HACK XXX - * Gtk just got initialized. And if we're using the SCIM IME, - * it just did a setlocale(LC_ALL, ""). so, BOOM. - */ - StartupLog("Setting locale"); - setlocale(LC_ALL, ""); - setlocale(LC_CTYPE, "C"); + // XXX HACK XXX + // We need to set LC_ALL to "" here for input methods to work reliably. + setlocale(LC_ALL, ""); + + // However LC_NUMERIC must be "C", otherwise some parsing fails. setlocale(LC_NUMERIC, "C"); -/* XXX HACK XXX */ #endif StartupLog("Initializing context models");