Correct signature of HitTest()

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index cf9aea83d095aed3785b3f5906c6e1a971c1d7e1..75342f2e67ac7c33bf110ffe11c39ec97b4e3f36 100644 (file)
--- 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 86a84f042ac2c650ba4e45defae3c5c01fcda462..136d7b944b45db14d504f60a9aa01353b67f7ba8 100644 (file)
--- 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 76b2ecffe3a089aa3de74c5f265ee1061e4cb62d..1dee882fa000ba0e4e504468634fe0f65d486297 100644 (file)
--- 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 fa4dd8c5c29f711a61431cdbae864ab6a4a2d578..099433e4c9aadf760c0b26c3160618ec6009ed0e 100644 (file)
--- 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 9023c136801ab440571e125ded5adba9082d9723..6caab4aded704a23358418d5e604f396d8e0045a 100644 (file)
--- 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,