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

wxInitializeLocale moved to wxExtend

Browse Source
This commit is contained in:
Simon Rozman 2016-10-05 12:11:17 +02:00
parent a2830d2aee
commit 5c966f35a8
4 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/EAPBase_UI/include/EAP_UI.h
View File

@ -122,11 +122,6 @@ inline wxString wxEAPGetProviderName(const std::wstring &id);
/// ///
inline void wxInitializeConfig(); inline void wxInitializeConfig();
///
/// Inizializes wxWidgets localization scheme
///
inline bool wxInitializeLocale(wxLocale &locale);
namespace eap namespace eap
{ {
@ -994,29 +989,6 @@ inline void wxInitializeConfig()
} }
inline bool wxInitializeLocale(wxLocale &locale)
{
// Read language from configuration.
wxLanguage lang_code;
wxString lang;
if (wxConfigBase::Get()->Read(wxT("Language"), &lang)) {
const wxLanguageInfo *lang_info = wxLocale::FindLanguageInfo(lang);
lang_code = lang_info ? (wxLanguage)lang_info->Language : wxLANGUAGE_DEFAULT;
} else
lang_code = wxLANGUAGE_DEFAULT;
if (wxLocale::IsAvailable(lang_code)) {
// Language is "available". Well... Known actually.
wxString sPath;
if (wxConfigBase::Get()->Read(wxT("LocalizationRepositoryPath"), &sPath))
locale.AddCatalogLookupPathPrefix(sPath);
return locale.Init(lang_code);
}
return false;
}
namespace eap namespace eap
{ {
class monitor_ui class monitor_ui

2
lib/TTLS_UI/build/TTLS_UI.props
View File

@ -5,7 +5,7 @@
<PropertyGroup /> <PropertyGroup />
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\wxExtend\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup /> <ItemGroup />

2
lib/TTLS_UI/src/StdAfx.h
View File

@ -29,5 +29,7 @@
#include "../../PAP_UI/include/PAP_UI.h" #include "../../PAP_UI/include/PAP_UI.h"
#include "../../MSCHAPv2_UI/include/MSCHAPv2_UI.h" #include "../../MSCHAPv2_UI/include/MSCHAPv2_UI.h"
#include <wxex/common.h>
#include <wx/app.h> #include <wx/app.h>
#include <wx/thread.h> #include <wx/thread.h>

2
lib/wxExtend

@ -1 +1 @@
Subproject commit d7ac16dd8dea0bc0d1e9618093f57e57538c1503 Subproject commit 887a2c8116b1bd639cf1583cc88a05778f7626bb