From 460091fb0b2ff114cc741372f15bb43b702ea3b1 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:24:35 +0200
Subject: 5.16

---
 lib/localization.h | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'lib/localization.h')

diff --git a/lib/localization.h b/lib/localization.h
index 125be0fd..2d871dd7 100644
--- a/lib/localization.h
+++ b/lib/localization.h
@@ -4,12 +4,12 @@
 // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
-#ifndef MISC_H_INCLUDED
-#define MISC_H_INCLUDED
+#ifndef LOCALIZATION_H_8917342083178321534
+#define LOCALIZATION_H_8917342083178321534
 
 #include <vector>
 #include <zen/file_error.h>
-#include <wx/string.h>
+//#include <wx/string.h>
 
 namespace zen
 {
@@ -19,10 +19,10 @@ public:
     struct Entry
     {
         int languageID;
-        wxString languageName;
-        wxString languageFile;
-        wxString translatorName;
-        wxString languageFlag;
+        std::wstring languageName;
+        std::wstring languageFile;
+        std::wstring translatorName;
+        std::wstring languageFlag;
     };
     static const std::vector<Entry>& get();
 
@@ -34,9 +34,13 @@ private:
     std::vector<Entry> locMapping;
 };
 
+
 void setLanguage(int language); //throw FileError
 int getLanguage();
 int retrieveSystemLanguage();
+
+void releaseWxLocale(); //wxLocale crashes miserably on wxGTK when destructor runs during global cleanup => call in wxApp::OnExit
+//"You should delete all wxWidgets object that you created by the time OnExit finishes. In particular, do not destroy them from application class' destructor!"
 }
 
-#endif // MISC_H_INCLUDED
+#endif //LOCALIZATION_H_8917342083178321534
-- 
cgit