Implement GetPageText for the OSX WebKit implementation.

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

diff --git a/include/wx/generic/dvrenderers.h b/include/wx/generic/dvrenderers.h
index 14669694d23055a7a0e28ca776579ad4266759bf..fe71dc45f6b71843504cf2cf29d226b3542fecf4 100644 (file)
--- a/include/wx/generic/dvrenderers.h
+++ b/include/wx/generic/dvrenderers.h
@@ -3,7 +3,7 @@
 // Purpose:     All generic wxDataViewCtrl renderer classes
 // Author:      Robert Roebling, Vadim Zeitlin
 // Created:     2009-11-07 (extracted from wx/generic/dataview.h)
-// RCS-ID:      $Id: wxhead.h,v 1.11 2009-06-29 10:23:04 zeitlin Exp $
+// RCS-ID:      $Id$
 // Copyright:   (c) 2006 Robert Roebling
 //              (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
@@ -23,7 +23,25 @@ public:
                               wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                               int align = wxDVR_DEFAULT_ALIGNMENT );
 
-    virtual wxDataViewCustomRenderer *WXGetAsCustom() { return this; }
+
+    // see the explanation of the following WXOnXXX() methods in wx/generic/dvrenderer.h
+
+    virtual bool WXOnActivate(const wxRect& cell,
+                              wxDataViewModel *model,
+                              const wxDataViewItem& item,
+                              unsigned int col)
+    {
+        return Activate(cell, model, item, col);
+    }
+
+    virtual bool WXOnLeftClick(const wxPoint& cursor,
+                               const wxRect& cell,
+                               wxDataViewModel *model,
+                               const wxDataViewItem &item,
+                               unsigned int col)
+    {
+        return LeftClick(cursor, cell, model, item, col);
+    }
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
@@ -49,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;
@@ -100,10 +118,14 @@ 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 bool WXOnLeftClick(const wxPoint& cursor,
+                               const wxRect& cell,
+                               wxDataViewModel *model,
+                               const wxDataViewItem& item,
+                               unsigned int col);
 private:
     bool    m_toggle;
 
@@ -155,9 +177,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;
@@ -182,10 +204,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 bool WXOnActivate(const wxRect& cell,
+                              wxDataViewModel *model,
+                              const wxDataViewItem& item,
+                              unsigned int col);
 
 private:
     wxDateTime    m_date;