From 700b850acdb4895a6f70942d1470e998d76819c1 Mon Sep 17 00:00:00 2001 From: comex Date: Sun, 21 Jun 2015 15:28:49 -0400 Subject: Fix misc. clang warnings - mostly complaints about inconsistent use of override. Previously, MacOpenFile only overrode anything on OS X; otherwise it was just a useless method, which is presumably why it wasn't marked override in the first place. Address this more sanely by wrapping it in #ifdef __APPLE__. --- Source/Core/DolphinWX/ControllerConfigDiag.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/DolphinWX/ControllerConfigDiag.cpp') diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp index 07b803b677..ab5e220764 100644 --- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp +++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp @@ -43,7 +43,7 @@ wxDEFINE_EVENT(wxEVT_ADAPTER_UPDATE, wxCommandEvent); ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent) : wxDialog(parent, wxID_ANY, _("Dolphin Controller Configuration")) { - m_gc_pad_type_strs = { + m_gc_pad_type_strs = {{ _("None"), _("Standard Controller"), _("Steering Wheel"), @@ -52,7 +52,7 @@ ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent) _("GBA"), _("Keyboard"), _("AM-Baseboard") - }; + }}; wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL); -- cgit v1.2.3