implement HitTest(pos) variant and not HitTest(x, y) one as this is what Windows...

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

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index e0928b117468440d6ac5272c657383b00f79138c..58d298125d37cbed250c12a37e1fb2fe8090d4da 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -103,9 +103,7 @@ public:
     virtual bool PositionToXY(long pos, long *x, long *y) const;
 
     virtual void ShowPosition(long pos);
-    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
-                                            wxTextCoord *col,
-                                            wxTextCoord *row) const;
+    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const;
 
     // Clipboard operations
     virtual void Copy();

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index b0d7135cc0a28270c3cc9b83e6b49d486c9b1748..e742baa4b0c8b1fc4bea4c17392ba488018f504d 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -1361,7 +1361,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
 }
 
 wxTextCtrlHitTestResult
-wxTextCtrl::HitTest(const wxPoint& pt, wxTextCoord *col, wxTextCoord *row) const
+wxTextCtrl::HitTest(const wxPoint& pt, long *posOut) const
 {
     // first get the position from Windows
     LPARAM lParam;
@@ -1440,11 +1440,8 @@ wxTextCtrl::HitTest(const wxPoint& pt, wxTextCoord *col, wxTextCoord *row) const
     else
         rc = wxTE_HT_ON_TEXT;
 
-    // finally translate to column/row
-    if ( !PositionToXY(pos, col, row) )
-    {
-        wxFAIL_MSG( _T("PositionToXY() not expected to fail in HitTest()") );
-    }
+    if ( posOut )
+        *posOut = pos;
 
     return rc;
 }