From 6236b8b477e113922c63db0c1413150bb1986ebf Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Mon, 30 Oct 2006 12:24:13 +0000
Subject: [PATCH] renamed wxControlWithArrows::HitTest() to HitTestArrow() to
 avoid conflict with wxWindow::HitTest()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/univ/scrarrow.h | 7 ++++---
 include/wx/univ/scrolbar.h | 2 +-
 include/wx/univ/spinbutt.h | 2 +-
 src/univ/scrarrow.cpp      | 4 ++--
 src/univ/scrolbar.cpp      | 2 +-
 src/univ/spinbutt.cpp      | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/wx/univ/scrarrow.h b/include/wx/univ/scrarrow.h
index 57cc4df70a..3ccda643d2 100644
--- a/include/wx/univ/scrarrow.h
+++ b/include/wx/univ/scrarrow.h
@@ -53,8 +53,9 @@ public:
                    bool scrollbarLike = false) const;
 
     // process a mouse move, enter or leave event, possibly calling
-    // wxControlWithArrows::SetArrowState() if wxControlWithArrows::HitTest()
-    // says that the mosue has left/entered an arrow
+    // wxControlWithArrows::SetArrowState() if
+    // wxControlWithArrows::HitTestArrow() says that the mouse has left/entered
+    // an arrow
     bool HandleMouseMove(const wxMouseEvent& event) const;
 
     // process a mouse click event
@@ -101,7 +102,7 @@ public:
                               int flag, bool set = true) = 0;
 
     // hit testing: return on which arrow the point is (or Arrow_None)
-    virtual wxScrollArrows::Arrow HitTest(const wxPoint& pt) const = 0;
+    virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const = 0;
 
     // called when the arrow is pressed, return true to continue scrolling and
     // false to stop it
diff --git a/include/wx/univ/scrolbar.h b/include/wx/univ/scrolbar.h
index 8580977eb1..b686eab5c0 100644
--- a/include/wx/univ/scrolbar.h
+++ b/include/wx/univ/scrolbar.h
@@ -116,7 +116,7 @@ public:
     virtual int GetArrowState(wxScrollArrows::Arrow arrow) const;
     virtual void SetArrowFlag(wxScrollArrows::Arrow arrow, int flag, bool set);
     virtual bool OnArrow(wxScrollArrows::Arrow arrow);
-    virtual wxScrollArrows::Arrow HitTest(const wxPoint& pt) const;
+    virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const;
 
     // for wxControlRenderer::DrawScrollbar() only
     const wxScrollArrows& GetArrows() const { return m_arrows; }
diff --git a/include/wx/univ/spinbutt.h b/include/wx/univ/spinbutt.h
index 9f74d2b648..61ee7f2bbf 100644
--- a/include/wx/univ/spinbutt.h
+++ b/include/wx/univ/spinbutt.h
@@ -53,7 +53,7 @@ public:
     virtual int GetArrowState(wxScrollArrows::Arrow arrow) const;
     virtual void SetArrowFlag(wxScrollArrows::Arrow arrow, int flag, bool set);
     virtual bool OnArrow(wxScrollArrows::Arrow arrow);
-    virtual wxScrollArrows::Arrow HitTest(const wxPoint& pt) const;
+    virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const;
 
     // for wxStdSpinButtonInputHandler
     const wxScrollArrows& GetArrows() { return m_arrows; }
diff --git a/src/univ/scrarrow.cpp b/src/univ/scrarrow.cpp
index 76347bfa07..94c79d6715 100644
--- a/src/univ/scrarrow.cpp
+++ b/src/univ/scrarrow.cpp
@@ -173,7 +173,7 @@ bool wxScrollArrows::HandleMouseMove(const wxMouseEvent& event) const
     }
     else // Moving() or Entering(), treat them the same here
     {
-        arrow = m_control->HitTest(event.GetPosition());
+        arrow = m_control->HitTestArrow(event.GetPosition());
     }
 
 #if wxUSE_TIMER
@@ -234,7 +234,7 @@ bool wxScrollArrows::HandleMouse(const wxMouseEvent& event) const
     {
         if ( !m_captureData )
         {
-            Arrow arrow = m_control->HitTest(event.GetPosition());
+            Arrow arrow = m_control->HitTestArrow(event.GetPosition());
             if ( arrow == Arrow_None )
             {
                 // mouse pressed over something else
diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp
index c9f56e5c74..e898958f94 100644
--- a/src/univ/scrolbar.cpp
+++ b/src/univ/scrolbar.cpp
@@ -298,7 +298,7 @@ wxSize wxScrollBar::DoGetBestClientSize() const
     return size;
 }
 
-wxScrollArrows::Arrow wxScrollBar::HitTest(const wxPoint& pt) const
+wxScrollArrows::Arrow wxScrollBar::HitTestArrow(const wxPoint& pt) const
 {
     switch ( m_renderer->HitTestScrollbar(this, pt) )
     {
diff --git a/src/univ/spinbutt.cpp b/src/univ/spinbutt.cpp
index 5090c6329d..c322345dee 100644
--- a/src/univ/spinbutt.cpp
+++ b/src/univ/spinbutt.cpp
@@ -324,7 +324,7 @@ void wxSpinButton::CalcArrowRects(wxRect *rect1, wxRect *rect2) const
     }
 }
 
-wxScrollArrows::Arrow wxSpinButton::HitTest(const wxPoint& pt) const
+wxScrollArrows::Arrow wxSpinButton::HitTestArrow(const wxPoint& pt) const
 {
     wxRect rectArrow1, rectArrow2;
     CalcArrowRects(&rectArrow1, &rectArrow2);
-- 
2.45.2