]> git.saurik.com Git - wxWidgets.git/commitdiff
Restored wxNotebook::HitTest for wxOSX-Carbon.
authorDimitri Schoolwerth <dimitri.schoolwerth@gmail.com>
Tue, 3 May 2011 12:47:10 +0000 (12:47 +0000)
committerDimitri Schoolwerth <dimitri.schoolwerth@gmail.com>
Tue, 3 May 2011 12:47:10 +0000 (12:47 +0000)
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

src/osx/notebook_osx.cpp

index 4886a876b471ed223a9c9d77433e2f9bd3ca7d49..0f0ea5f37ba14239fe8222ddce0140e9c0f6e891 100644 (file)
@@ -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;
 }