Added, documented and used wxGridCellChoiceEditor
taking wxArrayString. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
3bdb8629f8
commit
7db33cc310
@ -53,6 +53,8 @@ The editor for string data allowing to choose from a list of strings.
|
||||
|
||||
\func{}{wxGridCellChoiceEditor}{\param{size\_t }{count = 0}, \param{const wxString }{choices[] = NULL}, \param{bool }{allowOthers = false}}
|
||||
|
||||
\func{}{wxGridCellChoiceEditor}{\param{const wxArrayString& }{choices}, \param{bool }{allowOthers = false}}
|
||||
|
||||
\docparam{count}{Number of strings from which the user can choose.}
|
||||
\docparam{choices}{An array of strings from which the user can choose.}
|
||||
\docparam{allowOthers}{If allowOthers if true, the user can type a string not in choices array.}
|
||||
|
@ -567,6 +567,8 @@ public:
|
||||
wxGridCellChoiceEditor(size_t count = 0,
|
||||
const wxString choices[] = NULL,
|
||||
bool allowOthers = FALSE);
|
||||
wxGridCellChoiceEditor(const wxArrayString& choices,
|
||||
bool allowOthers = FALSE);
|
||||
|
||||
virtual void Create(wxWindow* parent,
|
||||
wxWindowID id,
|
||||
|
@ -1364,6 +1364,11 @@ wxString wxGridCellBoolEditor::GetValue() const
|
||||
// wxGridCellChoiceEditor
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
wxGridCellChoiceEditor::wxGridCellChoiceEditor(const wxArrayString& choices,
|
||||
bool allowOthers)
|
||||
: m_choices(choices),
|
||||
m_allowOthers(allowOthers) { }
|
||||
|
||||
wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count,
|
||||
const wxString choices[],
|
||||
bool allowOthers)
|
||||
|
@ -313,12 +313,16 @@ bool ctPropertyEditor::DisplayProperty(int row, ctProperty* prop, bool valueOnly
|
||||
// Set the value type
|
||||
if (prop->GetEditorType() == _T("choice"))
|
||||
{
|
||||
#if 0
|
||||
wxString* strArr = prop->GetChoices().GetStringArray();
|
||||
|
||||
m_attributeEditorGrid->SetCellEditor(row, 1,
|
||||
new wxGridCellChoiceEditor(prop->GetChoices().GetCount(), strArr));
|
||||
|
||||
delete[] strArr;
|
||||
#endif
|
||||
m_attributeEditorGrid->SetCellEditor(row, 1,
|
||||
new wxGridCellChoiceEditor(prop->GetChoices()));
|
||||
}
|
||||
else if (prop->GetEditorType() == _T("integer") || prop->GetVariant().GetType() == _T("long"))
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user