Moved wxPGChoices m_choices member from various property classes to base wxPGProperty. This allows any property to have choices without subclassing and therefore work with Choice and ComboBox editors. Also removed redundant choice manipulation functions from wxPropertyGridinterface (ie. now use ones in wxPGProperty).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -372,8 +372,6 @@ public:
|
||||
int argFlags = 0) const;
|
||||
WX_PG_DECLARE_EVENT_METHODS()
|
||||
|
||||
virtual int GetChoiceInfo( wxPGChoiceInfo* choiceinfo );
|
||||
|
||||
wxArrayInt GetValueAsArrayInt() const
|
||||
{
|
||||
return m_choices.GetValuesForStrings(m_value.GetArrayString());
|
||||
@@ -388,8 +386,6 @@ protected:
|
||||
|
||||
wxArrayString m_valueAsStrings; // Value as array of strings
|
||||
|
||||
wxPGChoices m_choices;
|
||||
|
||||
// Cache displayed text since generating it is relatively complicated.
|
||||
wxString m_display;
|
||||
};
|
||||
|
Reference in New Issue
Block a user