Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-03 00:59:43 +02:00
Code Issues Releases Wiki Activity

Implement ComboEditor::Clone, and use override

Browse Source
This commit is contained in:
Paul Licameli 2017-10-20 10:20:33 -04:00
parent 072667e908
commit a9f5c9c929
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Tags.cpp
View File

@ -587,6 +587,8 @@ class ComboEditor final : public wxGridCellChoiceEditor
public:
ComboEditor(const wxArrayString& choices, bool allowOthers = false)
: wxGridCellChoiceEditor(choices, allowOthers)
, m_choices{ choices }
, m_allowOthers{ allowOthers }
{
}
@ -595,7 +597,7 @@ public:
// Ignore it (a must on the Mac as the erasure causes problems.)
}
void SetParameters(const wxString& params)
void SetParameters(const wxString& params) override
{
wxGridCellChoiceEditor::SetParameters(params);
@ -606,7 +608,7 @@ public:
}
}
void SetSize(const wxRect& rectOrig)
void SetSize(const wxRect& rectOrig) override
{
wxRect rect(rectOrig);
wxRect r = Combo()->GetRect();
@ -620,7 +622,7 @@ public:
// Fix for Bug 1389
// July 2016: ANSWER-ME: Does this need reporting upstream to wxWidgets?
virtual void StartingKey(wxKeyEvent& event)
virtual void StartingKey(wxKeyEvent& event) override
{
// Lifted from wxGridCellTextEditor and adapted to combo.
@ -670,6 +672,15 @@ public:
}
}
// Clone is required by wxwidgets; implemented via copy constructor
wxGridCellEditor *Clone() const override
{
return safenew ComboEditor{ m_choices, m_allowOthers };
}
private:
wxArrayString m_choices;
bool m_allowOthers;
};
//