From: Dimitri Schoolwerth <dimitri.schoolwerth@gmail.com>
Date: Tue, 3 May 2011 12:47:10 +0000 (+0000)
Subject: Restored wxNotebook::HitTest for wxOSX-Carbon.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ddd7e4307b4a58a21e8a5eb04afe06e1fe65f7d8?ds=sidebyside

Restored wxNotebook::HitTest for wxOSX-Carbon.

Since the copying of src/osx/carbon/notebmac.cpp to src/osx/notebook_osx.cpp in r55202 the code in wxNotebook::HitTest has been disabled. Enabled it again for at least the Carbon build.

See #13045.


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

diff --git a/src/osx/notebook_osx.cpp b/src/osx/notebook_osx.cpp
index 4886a876b4..0f0ea5f37b 100644
--- a/src/osx/notebook_osx.cpp
+++ b/src/osx/notebook_osx.cpp
@@ -245,10 +245,10 @@ bool wxNotebook::InsertPage(size_t nPage,
     return true;
 }
 
-int wxNotebook::HitTest(const wxPoint& WXUNUSED(pt), long * WXUNUSED(flags)) const
+int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
 {
     int resultV = wxNOT_FOUND;
-#if 0
+#ifdef __WXOSX_CARBON__
     const int countPages = GetPageCount();
 
     // we have to convert from Client to Window relative coordinates
@@ -300,6 +300,9 @@ int wxNotebook::HitTest(const wxPoint& WXUNUSED(pt), long * WXUNUSED(flags)) con
         else
             *flags |= wxBK_HITTEST_NOWHERE;
     }
+#else
+    wxUnusedVar(pt);
+    wxUnusedVar(flags);
 #endif
     return resultV;
 }