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

Added, documented and used wxGridCellChoiceEditor

Browse Source 
taking wxArrayString.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-09-11 21:11:01 +00:00
parent 3bdb8629f8
commit 7db33cc310
4 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/latex/wx/gridedit.tex
View File

@@ -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{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{count}{Number of strings from which the user can choose.}
\docparam{choices}{An array 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.} \docparam{allowOthers}{If allowOthers if true, the user can type a string not in choices array.}

2
include/wx/generic/grid.h
View File

@@ -567,6 +567,8 @@ public:
wxGridCellChoiceEditor(size_t count = 0, wxGridCellChoiceEditor(size_t count = 0,
const wxString choices[] = NULL, const wxString choices[] = NULL,
bool allowOthers = FALSE); bool allowOthers = FALSE);
wxGridCellChoiceEditor(const wxArrayString& choices,
bool allowOthers = FALSE);
virtual void Create(wxWindow* parent, virtual void Create(wxWindow* parent,
wxWindowID id, wxWindowID id,

5
src/generic/grid.cpp
View File

@@ -1364,6 +1364,11 @@ wxString wxGridCellBoolEditor::GetValue() const
// wxGridCellChoiceEditor // wxGridCellChoiceEditor
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxGridCellChoiceEditor::wxGridCellChoiceEditor(const wxArrayString& choices,
bool allowOthers)
: m_choices(choices),
m_allowOthers(allowOthers) { }
wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count, wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count,
const wxString choices[], const wxString choices[],
bool allowOthers) bool allowOthers)

4
utils/configtool/src/propeditor.cpp
View File

@@ -313,12 +313,16 @@ bool ctPropertyEditor::DisplayProperty(int row, ctProperty* prop, bool valueOnly
// Set the value type // Set the value type
if (prop->GetEditorType() == _T("choice")) if (prop->GetEditorType() == _T("choice"))
{ {
#if 0
wxString* strArr = prop->GetChoices().GetStringArray(); wxString* strArr = prop->GetChoices().GetStringArray();
m_attributeEditorGrid->SetCellEditor(row, 1, m_attributeEditorGrid->SetCellEditor(row, 1,
new wxGridCellChoiceEditor(prop->GetChoices().GetCount(), strArr)); new wxGridCellChoiceEditor(prop->GetChoices().GetCount(), strArr));
delete[] strArr; delete[] strArr;
#endif
m_attributeEditorGrid->SetCellEditor(row, 1,
new wxGridCellChoiceEditor(prop->GetChoices()));
} }
else if (prop->GetEditorType() == _T("integer") || prop->GetVariant().GetType() == _T("long")) else if (prop->GetEditorType() == _T("integer") || prop->GetVariant().GetType() == _T("long"))
{ {