diff options
| author | comex <comexk@gmail.com> | 2015-06-21 15:28:49 -0400 |
|---|---|---|
| committer | comex <comexk@gmail.com> | 2015-06-21 15:42:49 -0400 |
| commit | 700b850acdb4895a6f70942d1470e998d76819c1 (patch) | |
| tree | 484b0f0a9e208d0df0b2152a64775b478976700d /Source/Core/DolphinWX/ControllerConfigDiag.cpp | |
| parent | d180e4469ee200494b4c78b448c1984dfdfbecff (diff) | |
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__.
Diffstat (limited to 'Source/Core/DolphinWX/ControllerConfigDiag.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/ControllerConfigDiag.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); |