Richtext interface fixes and additions for Phoenix

[wxWidgets.git] / include / wx / generic / choicdgg.h

diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h
index 230757b01f432465531120bd63eafc9dbc803b6b..39ac21ef33113c56dc1192c0aa3091e755e87946 100644 (file)
--- 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 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.
 
 #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
     (
     // 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
 
     )
 #endif // WXWIN_COMPATIBILITY_2_8