Amebis/GEANTLink
Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

wxWidget initialization improved to share same locale

Browse Source
This commit is contained in:
Simon Rozman 2016-09-02 10:00:19 +02:00
parent 566785192a
commit 0a0a28730b
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/TTLS_UI/src/Module.cpp
View File

@ -23,9 +23,6 @@
using namespace std; using namespace std;
using namespace winstd; using namespace winstd;
static wxCriticalSection s_lock;
static unsigned long s_init_ref_count = 0;
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// wxInitializerPeer // wxInitializerPeer
@ -38,7 +35,9 @@ public:
virtual ~wxInitializerPeer(); virtual ~wxInitializerPeer();
protected: protected:
wxLocale m_locale; ///< Locale static wxCriticalSection s_lock; ///< Initialization lock
static unsigned long s_init_ref_count; ///< Initialization reference counter
static wxLocale s_locale; ///< Locale
}; };
@ -341,9 +340,9 @@ wxInitializerPeer::wxInitializerPeer(_In_ HINSTANCE instance)
// Do our wxWidgets configuration and localization initialization. // Do our wxWidgets configuration and localization initialization.
wxInitializeConfig(); wxInitializeConfig();
if (wxInitializeLocale(m_locale)) { if (wxInitializeLocale(s_locale)) {
//m_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion)); //s_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion));
m_locale.AddCatalog(wxT("EAPTTLSUI")); s_locale.AddCatalog(wxT("EAPTTLSUI"));
} }
} }
@ -356,3 +355,8 @@ wxInitializerPeer::~wxInitializerPeer()
wxEntryCleanup(); wxEntryCleanup();
} }
wxCriticalSection wxInitializerPeer::s_lock;
unsigned long wxInitializerPeer::s_init_ref_count = 0;
wxLocale wxInitializerPeer::s_locale;