From 5cfb6fee91e8c440a45181de8bfa5f9d14b03735 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Mon, 17 Mar 2008 21:00:06 +0000
Subject: [PATCH] Make some wxDataViewCustomRenderer virtuals consistent across
 platforms. Add missing WXDLLIMPEXP_ADV. Add missing impl for
 wxDataViewEvent::GetPosition

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/dataview.h            |  2 +-
 include/wx/generic/dataview.h    |  2 +-
 include/wx/mac/carbon/dataview.h | 47 ++++++++++++++++++--------------
 interface/dataview.h             | 27 ++++++++++--------
 4 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index fc800bcea4..5e50b0a00e 100644
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -725,7 +725,7 @@ public:
     wxDataViewColumn *GetDataViewColumn() const { return m_column; }
 
     // for wxEVT_DATAVIEW_CONTEXT_MENU only
-    wxPoint GetPosition() const;
+    wxPoint GetPosition() const { return m_pos; }
     void SetPosition( int x, int y ) { m_pos.x = x; m_pos.y = y; }
 
     virtual wxEvent *Clone() const { return new wxDataViewEvent(*this); }
diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index eecad6d6eb..d48a6f050e 100644
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -243,7 +243,7 @@ protected:
 // wxDataViewIconTextRenderer
 // --------------------------------------------------------- 
 
-class wxDataViewIconTextRenderer: public wxDataViewCustomRenderer
+class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewCustomRenderer
 {
 public:
     wxDataViewIconTextRenderer( const wxString &varianttype = wxT("wxDataViewIconText"), 
diff --git a/include/wx/mac/carbon/dataview.h b/include/wx/mac/carbon/dataview.h
index 01bcffc4fe..6dcf5aa7aa 100644
--- a/include/wx/mac/carbon/dataview.h
+++ b/include/wx/mac/carbon/dataview.h
@@ -123,26 +123,33 @@ public:
 // 
   virtual bool Render(wxRect cell, wxDC* dc, int state) = 0;
 
-  virtual bool Activate(wxRect WXUNUSED(cell), wxDataViewModel *WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row))
-  {
-    return false;
-  }
-
-  virtual bool LeftClick(wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), wxDataViewModel *WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row))
-  {
-    return false;
-  }
-
-  virtual bool RightClick(wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), wxDataViewModel *WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row))
-  {
-    return false;
-  }
-
-  virtual bool StartDrag(wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), wxDataViewModel *WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row))
-  {
-    return false;
-  }
-
+  virtual bool Activate( wxRect WXUNUSED(cell),
+                         wxDataViewModel *WXUNUSED(model),
+                         const wxDataViewItem & WXUNUSED(item), 
+                         unsigned int WXUNUSED(col) )
+                         { return false; }
+
+  virtual bool LeftClick( wxPoint WXUNUSED(cursor),
+                          wxRect WXUNUSED(cell),
+                          wxDataViewModel *WXUNUSED(model),
+                          const wxDataViewItem & WXUNUSED(item), 
+                          unsigned int WXUNUSED(col) )
+                          { return false; }
+  
+  virtual bool RightClick( wxPoint WXUNUSED(cursor),
+                           wxRect WXUNUSED(cell),
+                           wxDataViewModel *WXUNUSED(model),
+                           const wxDataViewItem & WXUNUSED(item), 
+                           unsigned int WXUNUSED(col) )
+                           { return false; }
+  
+  virtual bool StartDrag( wxPoint WXUNUSED(cursor),
+                          wxRect WXUNUSED(cell),
+                          wxDataViewModel *WXUNUSED(model),
+                          const wxDataViewItem & WXUNUSED(item), 
+                          unsigned int WXUNUSED(col) )
+                          { return false; }
+    
 //
 // device context handling
 //
diff --git a/interface/dataview.h b/interface/dataview.h
index 30454f221c..5e92e6aefa 100644
--- a/interface/dataview.h
+++ b/interface/dataview.h
@@ -582,9 +582,10 @@ public:
     /**
         Override this to react to double clicks or ENTER.
     */
-    virtual bool Activate(wxRect cell, wxDataViewModel* model,
-                          unsigned int col,
-                          unsigned int row);
+    virtual bool Activate( wxRect cell,
+                           wxDataViewModel* model,
+                           const wxDataViewItem & item, 
+                           unsigned int col );
 
     /**
         Override this to create the actual editor control once editing
@@ -622,10 +623,11 @@ public:
     /**
         Overrride this to react to a left click.
     */
-    virtual bool LeftClick(wxPoint cursor, wxRect cell,
-                           wxDataViewModel* model,
-                           unsigned int col,
-                           unsigned int row);
+    virtual bool LeftClick( wxPoint cursor,
+                            wxRect cell,
+                            wxDataViewModel * model,
+                            const wxDataViewItem & item, 
+                            unsigned int col );
 
     /**
         Override this to render the cell. Before this is called,
@@ -646,18 +648,19 @@ public:
     /**
         Overrride this to react to a right click.
     */
-    virtual bool RightClick(wxPoint cursor, wxRect cell,
+    virtual bool RightClick(wxPoint cursor,
+                            wxRect cell,
                             wxDataViewModel* model,
-                            unsigned int col,
-                            unsigned int row);
+                            const wxDataViewItem & item, 
+                            unsigned int col);
 
     /**
         Overrride this to start a drag operation.
     */
     virtual bool StartDrag(wxPoint cursor, wxRect cell,
                            wxDataViewModel* model,
-                           unsigned int col,
-                           unsigned int row);
+                           const wxDataViewItem & item, 
+                           unsigned int col);
 };
 
 
-- 
2.45.2