diff --git a/src/wx/viewers.cpp b/src/wx/viewers.cpp index 1a98d6f0..ce8466cd 100644 --- a/src/wx/viewers.cpp +++ b/src/wx/viewers.cpp @@ -679,7 +679,7 @@ public: } void Goto(uint32_t addr) { - mv->Show(addr, true); + mv->ShowAddr(addr, true); } void RefreshCmd(wxCommandEvent& ev) { diff --git a/src/wx/viewsupt.cpp b/src/wx/viewsupt.cpp index 7276175d..3df1c6d1 100644 --- a/src/wx/viewsupt.cpp +++ b/src/wx/viewsupt.cpp @@ -725,7 +725,7 @@ void MemView::Resize(wxSizeEvent& ev) Refill(); } -void MemView::Show(uint32_t addr, bool force_update) +void MemView::ShowAddr(uint32_t addr, bool force_update) { if (addr < topaddr || addr >= topaddr + (nlines - 1) * 16) { // align to nearest 16-byte block diff --git a/src/wx/viewsupt.h b/src/wx/viewsupt.h index 1d9d01d7..e08c9f72 100644 --- a/src/wx/viewsupt.h +++ b/src/wx/viewsupt.h @@ -194,7 +194,7 @@ private: public: // make addr visible - void Show(uint32_t addr, bool force_update = false); + void ShowAddr(uint32_t addr, bool force_update = false); // current selection, or topaddr if none uint32_t GetAddr(); @@ -407,7 +407,7 @@ protected: // a display-only checkbox which does not look like it's disabled class DispCheckBox : public wxCheckBox { public: - bool AcceptsFocus() + bool AcceptsFocus() const { return false; } diff --git a/src/wx/widgets/wx/sdljoy.h b/src/wx/widgets/wx/sdljoy.h index d99cd7cf..b80a7a28 100644 --- a/src/wx/widgets/wx/sdljoy.h +++ b/src/wx/widgets/wx/sdljoy.h @@ -111,8 +111,6 @@ public: { return prev_val; } - // required for PostEvent, apparently - wxEvent* Clone(); protected: unsigned short joy; diff --git a/src/wx/wxvbam.h b/src/wx/wxvbam.h index 2da0eadc..618fe64c 100644 --- a/src/wx/wxvbam.h +++ b/src/wx/wxvbam.h @@ -283,7 +283,7 @@ public: void set_global_accels(); // 2.8 has no HasFocus(), and FindFocus() doesn't work right - bool HasFocus() + bool HasFocus() const { return focused; }