From a87b466df3551b4ffb7bc33b68b42f3a99e87030 Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Fri, 24 Aug 2007 20:00:32 +0000
Subject: [PATCH] Correct signature of HitTest()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/dataview.h         | 4 ++--
 include/wx/generic/dataview.h | 2 +-
 include/wx/gtk/dataview.h     | 2 +-
 src/generic/datavgen.cpp      | 6 +++---
 src/gtk/dataview.cpp          | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index cf9aea83d0..75342f2e67 100644
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -25,7 +25,7 @@
 
 #if defined(__WXGTK20__)
     // for testing
-    #define wxUSE_GENERICDATAVIEWCTRL 1
+    // #define wxUSE_GENERICDATAVIEWCTRL 1
 #elif defined(__WXMAC__)
 #else
     #define wxUSE_GENERICDATAVIEWCTRL 1
@@ -487,7 +487,7 @@ public:
 
     virtual void EnsureVisible( const wxDataViewItem & item,
                                 const wxDataViewColumn *column = NULL ) = 0;
-    virtual void HitTest( const wxPoint & point, wxDataViewItem &item, wxDataViewColumn* column ) const = 0;
+    virtual void HitTest( const wxPoint & point, wxDataViewItem &item, wxDataViewColumn* &column ) const = 0;
     virtual wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn *column = NULL ) const = 0;
 
 protected:
diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index 86a84f042a..136d7b944b 100644
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -366,7 +366,7 @@ public:
 
     virtual void EnsureVisible( const wxDataViewItem & item,
                                 const wxDataViewColumn *column = NULL );
-    virtual void HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* column ) const;
+    virtual void HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column ) const;
     virtual wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn *column = NULL ) const;
 
 protected:
diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index 76b2ecffe3..1dee882fa0 100644
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -319,7 +319,7 @@ public:
                                 const wxDataViewColumn *column = NULL );
     virtual void HitTest( const wxPoint &point, 
                           wxDataViewItem &item, 
-                          wxDataViewColumn *column ) const;
+                          wxDataViewColumn *&column ) const;
     virtual wxRect GetItemRect( const wxDataViewItem &item, 
                                 const wxDataViewColumn *column = NULL ) const;
 
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index fa4dd8c5c2..099433e4c9 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -509,7 +509,7 @@ public:
     //Methods for building the mapping tree
     void BuildTree( wxDataViewModel  * model );
     void DestroyTree();
-    void HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* column );
+    void HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column );
     wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column );
 private:
     wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row );
@@ -2943,7 +2943,7 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
     return node;
 }
 
-void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* column )
+void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column )
 {
     wxDataViewColumn *col = NULL;
     unsigned int cols = GetOwner()->GetColumnCount();
@@ -3791,7 +3791,7 @@ void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataVie
         
 }
 
-void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* column ) const
+void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column ) const
 {
     m_clientArea->HitTest(point, item, column);
 }
diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 9023c13680..6caab4aded 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -3102,10 +3102,10 @@ void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataVie
 }
 
 void wxDataViewCtrl::HitTest( const wxPoint &point, 
-                              wxDataViewItem &item,  wxDataViewColumn *column ) const
+                              wxDataViewItem &item,  wxDataViewColumn *&column ) const
 {
     item = wxDataViewItem(0);
-    column = 0;
+    column = NULL;
 }
 
 wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem &item, 
-- 
2.47.2