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
This commit is contained in:
@@ -245,10 +245,10 @@ bool wxNotebook::InsertPage(size_t nPage,
|
|||||||
return true;
|
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;
|
int resultV = wxNOT_FOUND;
|
||||||
#if 0
|
#ifdef __WXOSX_CARBON__
|
||||||
const int countPages = GetPageCount();
|
const int countPages = GetPageCount();
|
||||||
|
|
||||||
// we have to convert from Client to Window relative coordinates
|
// 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
|
else
|
||||||
*flags |= wxBK_HITTEST_NOWHERE;
|
*flags |= wxBK_HITTEST_NOWHERE;
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
wxUnusedVar(pt);
|
||||||
|
wxUnusedVar(flags);
|
||||||
#endif
|
#endif
|
||||||
return resultV;
|
return resultV;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user