Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed DoHitTest() to DoTreeHitTest() to avoid conflict with existing wxWindow method

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-10-17 19:31:40 +00:00
parent b220b1a2c8
commit 22574b4a9c
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/generic/treectlg.h
View File

@@ -304,7 +304,7 @@ protected:
const wxString& text, const wxString& text,
int image = -1, int selImage = -1, int image = -1, int selImage = -1,
wxTreeItemData *data = NULL); wxTreeItemData *data = NULL);
virtual wxTreeItemId DoHitTest(const wxPoint& point, int& flags); virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags);
// called by wxTextTreeCtrl when it marks itself for deletion // called by wxTextTreeCtrl when it marks itself for deletion
void ResetTextControl(); void ResetTextControl();

2
include/wx/msw/treectrl.h
View File

@@ -271,7 +271,7 @@ private:
const wxString& text, const wxString& text,
int image = -1, int selImage = -1, int image = -1, int selImage = -1,
wxTreeItemData *data = NULL); wxTreeItemData *data = NULL);
virtual wxTreeItemId DoHitTest(const wxPoint& point, int& flags); virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags);
int DoGetItemImageFromData(const wxTreeItemId& item, int DoGetItemImageFromData(const wxTreeItemId& item,
wxTreeItemIcon which) const; wxTreeItemIcon which) const;

7
include/wx/treectrl.h
View File

@@ -351,9 +351,9 @@ public:
// and, in the second variant, fill the flags parameter with a bitmask // and, in the second variant, fill the flags parameter with a bitmask
// of wxTREE_HITTEST_xxx constants. // of wxTREE_HITTEST_xxx constants.
wxTreeItemId HitTest(const wxPoint& point) wxTreeItemId HitTest(const wxPoint& point)
{ int dummy; return DoHitTest(point, dummy); } { int dummy; return DoTreeHitTest(point, dummy); }
wxTreeItemId HitTest(const wxPoint& point, int& flags) wxTreeItemId HitTest(const wxPoint& point, int& flags)
{ return DoHitTest(point, flags); } { return DoTreeHitTest(point, flags); }
// get the bounding rectangle of the item (or of its label only) // get the bounding rectangle of the item (or of its label only)
virtual bool GetBoundingRect(const wxTreeItemId& item, virtual bool GetBoundingRect(const wxTreeItemId& item,
@@ -390,7 +390,8 @@ protected:
// real HitTest() implementation: again, can't be called just HitTest() // real HitTest() implementation: again, can't be called just HitTest()
// because it's overloaded and so the non-virtual overload would be hidden // because it's overloaded and so the non-virtual overload would be hidden
virtual wxTreeItemId DoHitTest(const wxPoint& point, int& flags) = 0; // (and can't be called DoHitTest() because this is already in wxWindow)
virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) = 0;
wxImageList *m_imageListNormal, // images for tree elements wxImageList *m_imageListNormal, // images for tree elements

2
src/generic/treectlg.cpp
View File

@@ -2838,7 +2838,7 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
} }
} }
wxTreeItemId wxGenericTreeCtrl::DoHitTest(const wxPoint& point, int& flags) wxTreeItemId wxGenericTreeCtrl::DoTreeHitTest(const wxPoint& point, int& flags)
{ {
// JACS: removed wxYieldIfNeeded() because it can cause the window // JACS: removed wxYieldIfNeeded() because it can cause the window
// to be deleted from under us if a close window event is pending // to be deleted from under us if a close window event is pending

2
src/msw/treectrl.cpp
View File

@@ -2014,7 +2014,7 @@ void wxTreeCtrl::DoEndEditLabel(bool discardChanges)
DeleteTextCtrl(); DeleteTextCtrl();
} }
wxTreeItemId wxTreeCtrl::DoHitTest(const wxPoint& point, int& flags) wxTreeItemId wxTreeCtrl::DoTreeHitTest(const wxPoint& point, int& flags)
{ {
TV_HITTESTINFO hitTestInfo; TV_HITTESTINFO hitTestInfo;
hitTestInfo.pt.x = (int)point.x; hitTestInfo.pt.x = (int)point.x;