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__.
This commit is contained in:
parent
d180e4469e
commit
700b850acd
|
@ -43,7 +43,7 @@ wxDEFINE_EVENT(wxEVT_ADAPTER_UPDATE, wxCommandEvent);
|
||||||
ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent)
|
ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent)
|
||||||
: wxDialog(parent, wxID_ANY, _("Dolphin Controller Configuration"))
|
: wxDialog(parent, wxID_ANY, _("Dolphin Controller Configuration"))
|
||||||
{
|
{
|
||||||
m_gc_pad_type_strs = {
|
m_gc_pad_type_strs = {{
|
||||||
_("None"),
|
_("None"),
|
||||||
_("Standard Controller"),
|
_("Standard Controller"),
|
||||||
_("Steering Wheel"),
|
_("Steering Wheel"),
|
||||||
|
@ -52,7 +52,7 @@ ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent)
|
||||||
_("GBA"),
|
_("GBA"),
|
||||||
_("Keyboard"),
|
_("Keyboard"),
|
||||||
_("AM-Baseboard")
|
_("AM-Baseboard")
|
||||||
};
|
}};
|
||||||
|
|
||||||
wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
|
wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
|
||||||
|
|
||||||
|
|
|
@ -276,12 +276,14 @@ bool DolphinApp::OnInit()
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef __APPLE__
|
||||||
void DolphinApp::MacOpenFile(const wxString &fileName)
|
void DolphinApp::MacOpenFile(const wxString &fileName)
|
||||||
{
|
{
|
||||||
FileToLoad = fileName;
|
FileToLoad = fileName;
|
||||||
LoadFile = true;
|
LoadFile = true;
|
||||||
main_frame->BootGame(WxStrToStr(FileToLoad));
|
main_frame->BootGame(WxStrToStr(FileToLoad));
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void DolphinApp::AfterInit()
|
void DolphinApp::AfterInit()
|
||||||
{
|
{
|
||||||
|
|
|
@ -23,7 +23,9 @@ private:
|
||||||
void OnFatalException() override;
|
void OnFatalException() override;
|
||||||
bool Initialize(int& c, wxChar **v) override;
|
bool Initialize(int& c, wxChar **v) override;
|
||||||
void InitLanguageSupport();
|
void InitLanguageSupport();
|
||||||
void MacOpenFile(const wxString &fileName);
|
#ifdef __APPLE__
|
||||||
|
void MacOpenFile(const wxString &fileName) override;
|
||||||
|
#endif
|
||||||
|
|
||||||
bool BatchMode;
|
bool BatchMode;
|
||||||
bool LoadFile;
|
bool LoadFile;
|
||||||
|
|
|
@ -57,9 +57,9 @@ public:
|
||||||
|
|
||||||
Keyboard(IOHIDDeviceRef device, std::string name, int index, void *window);
|
Keyboard(IOHIDDeviceRef device, std::string name, int index, void *window);
|
||||||
|
|
||||||
std::string GetName() const;
|
std::string GetName() const override;
|
||||||
std::string GetSource() const;
|
std::string GetSource() const override;
|
||||||
int GetId() const;
|
int GetId() const override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct
|
struct
|
||||||
|
|
Loading…
Reference in New Issue