diff --git a/Externals/wxWidgets3/build/msw/wx_base.vcxproj b/Externals/wxWidgets3/build/msw/wx_base.vcxproj index d212dce20f..7a2591b851 100644 --- a/Externals/wxWidgets3/build/msw/wx_base.vcxproj +++ b/Externals/wxWidgets3/build/msw/wx_base.vcxproj @@ -1273,7 +1273,9 @@ true - + + true + diff --git a/Externals/wxWidgets3/wx/wxmsw.h b/Externals/wxWidgets3/wx/wxmsw.h index 5443e75795..b53fdb6ed8 100644 --- a/Externals/wxWidgets3/wx/wxmsw.h +++ b/Externals/wxWidgets3/wx/wxmsw.h @@ -1209,7 +1209,7 @@ // Set to 0 to disable the use of the native progress dialog (currently only // available under MSW and suffering from some bugs there, hence this option). -#define wxUSE_NATIVE_PROGRESSDLG 1 +#define wxUSE_NATIVE_PROGRESSDLG 0 // support for startup tips (wxShowTip &c) #define wxUSE_STARTUP_TIPS 1 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