From 805b7b2109690e6064083b7d65a7eab5786d6b5d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 20 Feb 2012 21:56:18 +0000 Subject: [PATCH] Make wxSingleChoiceDialog::GetSelectionData() const. Also restore const-ness of GetSelectionClientData() lost in r70514. Closes #14001. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/choicdgg.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h index 230757b01f..39ac21ef33 100644 --- a/include/wx/generic/choicdgg.h +++ b/include/wx/generic/choicdgg.h @@ -143,7 +143,7 @@ public: void SetSelection(int sel); int GetSelection() const { return m_selection; } wxString GetStringSelection() const { return m_stringSelection; } - void* GetSelectionData() { return m_clientData; } + void* GetSelectionData() const { return m_clientData; } #if WXWIN_COMPATIBILITY_2_8 // Deprecated overloads taking "char**" client data. @@ -208,8 +208,8 @@ public: // NB: no need to make it return wxChar, it's untyped wxDEPRECATED_ACCESSOR ( - char* GetSelectionClientData(), - (char*)GetClientData() + char* GetSelectionClientData() const, + (char*)GetSelectionData() ) #endif // WXWIN_COMPATIBILITY_2_8 -- 2.45.2