Move wxDataViewCustomRendererBase::ActivateCell() to datavcmn.cpp.

It triggered deprecation warnings in user code when it was inline.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dvrenderers.h b/include/wx/dvrenderers.h
index 7cbb7b220ef079af4ad2b3b4a8470e763ad2cc99..9e34a32c878f302dd4ff55a1a36aa38c2b272499 100644 (file)
--- a/include/wx/dvrenderers.h
+++ b/include/wx/dvrenderers.h
@@ -236,14 +236,7 @@ public:
                               wxDataViewModel *model,
                               const wxDataViewItem & item,
                               unsigned int col,
                               wxDataViewModel *model,
                               const wxDataViewItem & item,
                               unsigned int col,

-                              const wxMouseEvent* mouseEvent)
-    {
-        // Compatibility code
-        if ( mouseEvent )
-            return LeftClick(mouseEvent->GetPosition(), cell, model, item, col);
-        else
-            return Activate(cell, model, item, col);
-    }
+                              const wxMouseEvent* mouseEvent);

 
     // Deprecated, use (and override) ActivateCell() instead
     wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(
 
     // Deprecated, use (and override) ActivateCell() instead
     wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 858aa98a9aca4e4b7112a2dd517e30599f2c75db..ad62ddae046d8a8e7c4bf5e6ef540d2f0585bff7 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -807,6 +807,19 @@ void wxDataViewRendererBase::PrepareForItem(const wxDataViewModel *model,
 // wxDataViewCustomRendererBase
 // ----------------------------------------------------------------------------
 
 // wxDataViewCustomRendererBase
 // ----------------------------------------------------------------------------
 

+bool wxDataViewCustomRendererBase::ActivateCell(const wxRect& cell,
+                                                wxDataViewModel *model,
+                                                const wxDataViewItem & item,
+                                                unsigned int col,
+                                                const wxMouseEvent* mouseEvent)
+{
+    // Compatibility code
+    if ( mouseEvent )
+        return LeftClick(mouseEvent->GetPosition(), cell, model, item, col);
+    else
+        return Activate(cell, model, item, col);
+}
+

 void
 wxDataViewCustomRendererBase::WXCallRender(wxRect rectCell, wxDC *dc, int state)
 {
 void
 wxDataViewCustomRendererBase::WXCallRender(wxRect rectCell, wxDC *dc, int state)
 {