From d409abf4c6aa0fc25971ca7aef52d3bef71902e5 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Fri, 4 Jan 2019 15:42:44 +0100 Subject: [PATCH] Reverted a change specific to Win32 to try to set Win32 locale for the decimal point. This only works for the current user's locale and it changes it system wide. --- src/slic3r/GUI/GUI_App.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 1d11bbe00..091071e16 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -461,10 +461,8 @@ bool GUI_App::select_language( wxArrayString & names, m_wxLocale->Init(identifiers[index]); m_wxLocale->AddCatalogLookupPathPrefix(wxString::FromUTF8(localization_dir())); m_wxLocale->AddCatalog(/*GetAppName()*/"Slic3rPE"); - wxSetlocale(LC_NUMERIC, "C"); -#ifdef WIN32 - ::SetLocaleInfoA(LOCALE_CUSTOM_DEFAULT, LOCALE_SDECIMAL, "."); -#endif /* WIN32 */ + //FIXME This is a temporary workaround, the correct solution is to switch to "C" locale during file import / export only. + wxSetlocale(LC_NUMERIC, "C"); Preset::update_suffix_modified(); return true; } @@ -491,10 +489,8 @@ bool GUI_App::load_language() m_wxLocale->Init(identifiers[i]); m_wxLocale->AddCatalogLookupPathPrefix(wxString::FromUTF8(localization_dir())); m_wxLocale->AddCatalog(/*GetAppName()*/"Slic3rPE"); + //FIXME This is a temporary workaround, the correct solution is to switch to "C" locale during file import / export only. wxSetlocale(LC_NUMERIC, "C"); -#ifdef WIN32 - ::SetLocaleInfoA(LOCALE_CUSTOM_DEFAULT, LOCALE_SDECIMAL, "."); -#endif /* WIN32 */ Preset::update_suffix_modified(); return true; }