From 6726a6b09748c707351987da56226ac0316d1a00 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 23 Jul 2004 18:43:32 +0000 Subject: [PATCH] implement HitTest(pos) variant and not HitTest(x, y) one as this is what Windows gives us git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/textctrl.h | 4 +--- src/msw/textctrl.cpp | 9 +++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h index e0928b1174..58d298125d 100644 --- 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 b0d7135cc0..e742baa4b0 100644 --- 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; } -- 2.45.2