wxNB_HITTEST_* flags renamed to wxBK_HITTEST_* to serve all book controls.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -778,15 +778,15 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
|
||||
|
||||
if ( pixmap && IsPointInsideWidget(pt, pixmap, x, y) )
|
||||
{
|
||||
*flags = wxNB_HITTEST_ONICON;
|
||||
*flags = wxBK_HITTEST_ONICON;
|
||||
}
|
||||
else if ( IsPointInsideWidget(pt, GTK_WIDGET(nb_page->m_label), x, y) )
|
||||
{
|
||||
*flags = wxNB_HITTEST_ONLABEL;
|
||||
*flags = wxBK_HITTEST_ONLABEL;
|
||||
}
|
||||
else
|
||||
{
|
||||
*flags = wxNB_HITTEST_ONITEM;
|
||||
*flags = wxBK_HITTEST_ONITEM;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -796,7 +796,7 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
|
||||
|
||||
if ( flags )
|
||||
{
|
||||
*flags = wxNB_HITTEST_NOWHERE;
|
||||
*flags = wxBK_HITTEST_NOWHERE;
|
||||
wxWindowBase * page = GetCurrentPage();
|
||||
if ( page )
|
||||
{
|
||||
@@ -808,7 +808,7 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
|
||||
rect.x -= pos.x;
|
||||
rect.y -= pos.y;
|
||||
if ( rect.Inside( pt ) )
|
||||
*flags |= wxNB_HITTEST_ONPAGE;
|
||||
*flags |= wxBK_HITTEST_ONPAGE;
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user