Reset previous sort column in generic wxDataViewColumn::SetSortOrder().

[wxWidgets.git] / include / wx / generic / dvrenderers.h

diff --git a/include/wx/generic/dvrenderers.h b/include/wx/generic/dvrenderers.h
index e94e518b87f0c44c4a2c234640d30f27f09be2aa..513189496050cbb58100173e4da6854a141007c8 100644 (file)
--- 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,7 +121,13 @@ public:
     wxSize GetSize() const;
 
     // Implementation only, don't use nor override
-    virtual bool WXOnActivate(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);
@@ -176,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;
@@ -205,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);