X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2425a43ec49de87bf97403ca16fb41cdd8a0bc4..83ed867e70da06acb2311fa5749263b483c2002c:/include/wx/generic/dvrenderers.h diff --git a/include/wx/generic/dvrenderers.h b/include/wx/generic/dvrenderers.h index dc1bc24f7f..5131894960 100644 --- a/include/wx/generic/dvrenderers.h +++ b/include/wx/generic/dvrenderers.h @@ -26,7 +26,7 @@ public: // see the explanation of the following WXOnXXX() methods in wx/generic/dvrenderer.h - virtual bool WXOnActivate(wxRect cell, + virtual bool WXOnActivate(const wxRect& cell, wxDataViewModel *model, const wxDataViewItem& item, unsigned int col) @@ -34,8 +34,8 @@ public: return Activate(cell, model, item, col); } - virtual bool WXOnLeftClick(wxPoint cursor, - wxRect cell, + virtual bool WXOnLeftClick(const wxPoint& cursor, + const wxRect& cell, wxDataViewModel *model, const wxDataViewItem &item, unsigned int col) @@ -67,9 +67,9 @@ public: // in-place editing virtual bool HasEditorCtrl() const; - virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, - const wxVariant &value ); - virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ); + virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, + const wxVariant &value ); + virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); protected: wxString m_text; @@ -121,11 +121,16 @@ public: wxSize GetSize() const; // Implementation only, don't use nor override - virtual bool WXOnLeftClick(wxPoint cursor, - wxRect cell, + virtual bool WXOnLeftClick(const wxPoint& cursor, + const wxRect& cell, wxDataViewModel *model, const wxDataViewItem& item, unsigned int col); + + virtual bool WXOnActivate(const wxRect& cell, + wxDataViewModel *model, + const wxDataViewItem& item, + unsigned int col); private: bool m_toggle; @@ -177,9 +182,9 @@ public: virtual wxSize GetSize() const; virtual bool HasEditorCtrl() const { return true; } - virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, - const wxVariant &value ); - virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ); + virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, + const wxVariant &value ); + virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); private: wxDataViewIconText m_value; @@ -206,7 +211,7 @@ public: virtual wxSize GetSize() const; // Implementation only, don't use nor override - virtual bool WXOnActivate(wxRect cell, + virtual bool WXOnActivate(const wxRect& cell, wxDataViewModel *model, const wxDataViewItem& item, unsigned int col);