Don't redefine wxNO_EXCEPTIONS in wx/except.h if it's already defined.

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

diff --git a/include/wx/generic/dvrenderers.h b/include/wx/generic/dvrenderers.h
index 3ebe0d0f3ee0235b734c7bbb176d561279c6bc4a..62670c787ba3e5b95c7b32181cba8e6f25266daa 100644 (file)
--- a/include/wx/generic/dvrenderers.h
+++ b/include/wx/generic/dvrenderers.h
@@ -100,10 +100,13 @@ public:
     bool GetValue( wxVariant &value ) const;
 
     bool Render( wxRect cell, wxDC *dc, int state );
-    bool Activate( wxRect cell, wxDataViewModel *model, const wxDataViewItem & item,
-                            unsigned int col );
     wxSize GetSize() const;
 
+    // Implementation only, don't use nor override
+    virtual void WXOnActivate(wxDataViewModel *model,
+                              const wxVariant& valueOld,
+                              const wxDataViewItem& item,
+                              unsigned int col);
 private:
     bool    m_toggle;
 
@@ -182,10 +185,12 @@ public:
 
     virtual bool Render( wxRect cell, wxDC *dc, int state );
     virtual wxSize GetSize() const;
-    virtual bool Activate( wxRect cell,
-                           wxDataViewModel *model,
-                           const wxDataViewItem& item,
-                           unsigned int col );
+
+    // Implementation only, don't use nor override
+    virtual void WXOnActivate(wxDataViewModel *model,
+                              const wxVariant& valueOld,
+                              const wxDataViewItem& item,
+                              unsigned int col);
 
 private:
     wxDateTime    m_date;