Merge pull request #4015 from EmptyChaos/wx-misc-fixes

WX: Fix pop-under (win) / game list garbage (win) / language support (Linux)
This commit is contained in:
shuffle2
2016-10-02 22:46:14 -07:00
committed by GitHub
5 changed files with 43 additions and 5 deletions

View File

@ -315,11 +315,11 @@ void DolphinApp::InitLanguageSupport()
m_locale.reset(new wxLocale(language));
// Specify where dolphins *.gmo files are located on each operating system
#ifdef _WIN32
#ifdef __WXMSW__
m_locale->AddCatalogLookupPathPrefix(StrToWxStr(File::GetExeDirectory() + DIR_SEP "Languages"));
#elif defined(__LINUX__)
#elif defined(__WXGTK__)
m_locale->AddCatalogLookupPathPrefix(StrToWxStr(DATA_DIR "../locale"));
#elif defined(__APPLE__)
#elif defined(__WXOSX__)
m_locale->AddCatalogLookupPathPrefix(
StrToWxStr(File::GetBundleDirectory() + "Contents/Resources"));
#endif