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

wxPGDoubleClickProcessor should be used only with wxBoolProperty

Browse Source 
Using double-click processor makes sense only for wxBoolProperty so this constraint should be enforced in the declaration of the class.
This commit is contained in:
Artur Wieczorek
2019-05-12 11:48:35 +02:00
parent 1b977718d4
commit bb232f42c1
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/propgrid/editors.cpp
View File

@@ -520,12 +520,9 @@ class wxPGDoubleClickProcessor : public wxEvtHandler
{ {
public: public:
wxPGDoubleClickProcessor( wxOwnerDrawnComboBox* combo, wxPGProperty* property ) wxPGDoubleClickProcessor( wxOwnerDrawnComboBox* combo, wxBoolProperty* property )
: wxEvtHandler() : wxEvtHandler()
{ {
wxASSERT_MSG( wxDynamicCast(property, wxBoolProperty),
wxS("Double-click processor should be used only with wxBoolProperty") );
m_timeLastMouseUp = 0; m_timeLastMouseUp = 0;
m_combo = combo; m_combo = combo;
m_property = property; m_property = property;
@@ -589,7 +586,7 @@ protected:
private: private:
wxMilliClock_t m_timeLastMouseUp; wxMilliClock_t m_timeLastMouseUp;
wxOwnerDrawnComboBox* m_combo; wxOwnerDrawnComboBox* m_combo;
wxPGProperty* m_property; // Selected property wxBoolProperty* m_property; // Selected property
bool m_downReceived; bool m_downReceived;
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
@@ -646,9 +643,10 @@ public:
// only for wxBoolProperty. // only for wxBoolProperty.
m_selProp = GetGrid()->GetSelection(); m_selProp = GetGrid()->GetSelection();
wxASSERT(m_selProp); wxASSERT(m_selProp);
if (wxDynamicCast(m_selProp, wxBoolProperty)) wxBoolProperty* boolProp = wxDynamicCast(m_selProp, wxBoolProperty);
if ( boolProp )
{ {
m_dclickProcessor = new wxPGDoubleClickProcessor(this, m_selProp); m_dclickProcessor = new wxPGDoubleClickProcessor(this, boolProp);
PushEventHandler(m_dclickProcessor); PushEventHandler(m_dclickProcessor);
} }