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

Implement method to set items of wxPGChoiceEditor

Browse Source 
In addition to the current methods to add/delete one item to the control
we would need a method to replace all existing control items with new ones
at once.
This commit is contained in:
Artur Wieczorek
2020-05-01 17:57:46 +02:00
parent 9d4bb47050
commit 8a9e5e5ac7
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/propgrid/editors.h
View File

@@ -167,6 +167,10 @@ public:
// Default implementation does nothing. // Default implementation does nothing.
virtual void DeleteItem( wxWindow* ctrl, int index ) const; virtual void DeleteItem( wxWindow* ctrl, int index ) const;
// Sets items of existing control.
// Default implementation does nothing.
virtual void SetItems(wxWindow* ctrl, const wxArrayString& labels) const;
// Extra processing when control gains focus. For example, wxTextCtrl // Extra processing when control gains focus. For example, wxTextCtrl
// based controls should select all text. // based controls should select all text.
virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const; virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const;
@@ -273,6 +277,8 @@ public:
const wxString& label, const wxString& label,
int index ) const wxOVERRIDE; int index ) const wxOVERRIDE;
virtual void DeleteItem( wxWindow* ctrl, int index ) const wxOVERRIDE; virtual void DeleteItem( wxWindow* ctrl, int index ) const wxOVERRIDE;
virtual void SetItems(wxWindow* ctrl, const wxArrayString& labels) const wxOVERRIDE;
virtual bool CanContainCustomImage() const wxOVERRIDE; virtual bool CanContainCustomImage() const wxOVERRIDE;
// CreateControls calls this with CB_READONLY in extraStyle // CreateControls calls this with CB_READONLY in extraStyle

12
src/propgrid/editors.cpp
View File

@@ -164,6 +164,9 @@ void wxPGEditor::DeleteItem( wxWindow*, int ) const
return; return;
} }
void wxPGEditor::SetItems(wxWindow* WXUNUSED(ctrl), const wxArrayString& WXUNUSED(labels)) const
{
}
void wxPGEditor::OnFocus( wxPGProperty*, wxWindow* ) const void wxPGEditor::OnFocus( wxPGProperty*, wxWindow* ) const
{ {
@@ -1091,6 +1094,15 @@ void wxPGChoiceEditor::DeleteItem( wxWindow* ctrl, int index ) const
cb->Delete(index); cb->Delete(index);
} }
void wxPGChoiceEditor::SetItems(wxWindow* ctrl, const wxArrayString& labels) const
{
wxASSERT( ctrl );
wxOwnerDrawnComboBox* cb = wxDynamicCast(ctrl, wxOwnerDrawnComboBox);
wxASSERT( cb );
cb->Set(labels);
}
bool wxPGChoiceEditor::OnEvent( wxPropertyGrid* propGrid, wxPGProperty* property, bool wxPGChoiceEditor::OnEvent( wxPropertyGrid* propGrid, wxPGProperty* property,
wxWindow* ctrl, wxEvent& event ) const wxWindow* ctrl, wxEvent& event ) const
{ {