summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorEmptyChaos <EmptyChaos@users.noreply.github.com>2016-08-03 14:36:32 +0000
committerEmptyChaos <EmptyChaos@users.noreply.github.com>2016-08-31 14:32:39 +1000
commit50756d69c08e5f6da8d0a9d14eb924aeb5cec3ca (patch)
tree60b470b29480ed29853ed8a9e0d0c7040fc3167b /Source/Core
parentdef0b42fb7002dc14340fa54562dd878c115557e (diff)
WX: Various fixes.
Dolphin no longer lowers itself below the top window when opening. Dolphin no longer draws garbage lines all over the game list. Use the correct platform macros so Dolphin can actually find the translation catalogs on Unix.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinWX/GameListCtrl.cpp7
-rw-r--r--Source/Core/DolphinWX/Main.cpp6
2 files changed, 10 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp
index cbbd4ad6b7..0f629d70b0 100644
--- a/Source/Core/DolphinWX/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/GameListCtrl.cpp
@@ -173,6 +173,13 @@ CGameListCtrl::CGameListCtrl(wxWindow* parent, const wxWindowID id, const wxPoin
Bind(wxEVT_MENU, &CGameListCtrl::OnChangeDisc, this, IDM_LIST_CHANGE_DISC);
wxTheApp->Bind(DOLPHIN_EVT_LOCAL_INI_CHANGED, &CGameListCtrl::OnLocalIniModified, this);
+
+#ifdef _WIN32
+ // Default Windows Themes (Aero, Win10) draw column separators which do not appear when
+ // using the default unthemed appearance. This is a new behavior in wx3.1 since wx3.0
+ // and lower did not support themes at all.
+ EnableSystemTheme(false);
+#endif
}
CGameListCtrl::~CGameListCtrl()
diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp
index 20460e258c..6e94b06316 100644
--- a/Source/Core/DolphinWX/Main.cpp
+++ b/Source/Core/DolphinWX/Main.cpp
@@ -307,11 +307,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