Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make radio button navigation functions const

Browse Source 
This requires adding a couple of const_cast<>s in their implementation
in order to still allow them returning non-const wxRadioButton pointers,
but this seems preferable to not being able to call them on a const
wxRadioButton in the first place.
This commit is contained in:
Vadim Zeitlin
2020-09-21 15:36:41 +02:00
parent b5fb9bd8d6
commit 1a4f628e40
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/radiobut.h
View File

@@ -36,10 +36,10 @@ class WXDLLIMPEXP_FWD_CORE wxRadioButton;
namespace wxPrivate
{
WXDLLIMPEXP_CORE wxRadioButton* wxGetNextButtonInGroup(wxRadioButton *btn);
WXDLLIMPEXP_CORE wxRadioButton* wxGetPreviousButtonInGroup(wxRadioButton *btn);
WXDLLIMPEXP_CORE wxRadioButton* wxGetFirstButtonInGroup(wxRadioButton *btn);
WXDLLIMPEXP_CORE wxRadioButton* wxGetLastButtonInGroup(wxRadioButton *btn);
WXDLLIMPEXP_CORE wxRadioButton* wxGetNextButtonInGroup(const wxRadioButton *btn);
WXDLLIMPEXP_CORE wxRadioButton* wxGetPreviousButtonInGroup(const wxRadioButton *btn);
WXDLLIMPEXP_CORE wxRadioButton* wxGetFirstButtonInGroup(const wxRadioButton *btn);
WXDLLIMPEXP_CORE wxRadioButton* wxGetLastButtonInGroup(const wxRadioButton *btn);
} // namespace wxPrivate
template <class W>
@@ -50,24 +50,24 @@ public:
wxRadioButtonBase() { }
wxRadioButton* GetFirstInGroup()
wxRadioButton* GetFirstInGroup() const
{
return wxPrivate::wxGetFirstButtonInGroup( static_cast<wxRadioButton*>(this));
return wxPrivate::wxGetFirstButtonInGroup(static_cast<const wxRadioButton*>(this));
}
wxRadioButton* GetLastInGroup()
wxRadioButton* GetLastInGroup() const
{
return wxPrivate::wxGetLastButtonInGroup( static_cast<wxRadioButton*>(this));
return wxPrivate::wxGetLastButtonInGroup(static_cast<const wxRadioButton*>(this));
}
wxRadioButton* GetPreviousInGroup()
wxRadioButton* GetPreviousInGroup() const
{
return wxPrivate::wxGetPreviousButtonInGroup( static_cast<wxRadioButton*>(this));
return wxPrivate::wxGetPreviousButtonInGroup(static_cast<const wxRadioButton*>(this));
}
wxRadioButton* GetNextInGroup()
wxRadioButton* GetNextInGroup() const
{
return wxPrivate::wxGetNextButtonInGroup( static_cast<wxRadioButton*>(this));
return wxPrivate::wxGetNextButtonInGroup(static_cast<const wxRadioButton*>(this));
}
private: