Index: wxFlatNotebook.cpp
===================================================================
--- wxFlatNotebook.cpp (revision 4338)
+++ wxFlatNotebook.cpp (working copy)
@@ -1122,7 +1122,11 @@
}
rect = wxRect(btnXPos, 8, 16, 16);
+#if wxCHECK_VERSION(2, 8, 0)
if(rect.Contains(pt))
+#else
+ if(rect.Inside(pt))
+#endif
{
return (style & wxFNB_NO_X_BUTTON) ? wxFNB_NOWHERE : wxFNB_X;
}
@@ -1131,18 +1135,30 @@
if( style & wxFNB_DROPDOWN_TABS_LIST )
{
rect = wxRect(render->GetDropArrowButtonPos( this ), 8, 16, 16);
+#if wxCHECK_VERSION(2, 8, 0)
if( rect.Contains(pt) )
+#else
+ if( rect.Inside(pt) )
+#endif
return wxFNB_DROP_DOWN_ARROW;
}
+#if wxCHECK_VERSION(2, 8, 0)
if(rect.Contains(pt))
+#else
+ if(rect.Inside(pt))
+#endif
{
return (style & wxFNB_NO_NAV_BUTTONS) ? wxFNB_NOWHERE : wxFNB_RIGHT_ARROW;
}
rect = wxRect(btnLeftPos, 8, 16, 16);
+#if wxCHECK_VERSION(2, 8, 0)
if(rect.Contains(pt))
+#else
+ if(rect.Inside(pt))
+#endif
{
return (style & wxFNB_NO_NAV_BUTTONS) ? wxFNB_NOWHERE : wxFNB_LEFT_ARROW;
}
@@ -1159,7 +1175,11 @@
if(style & wxFNB_X_ON_TAB && (int)cur == GetSelection())
{
// 'x' button exists on a tab
+#if wxCHECK_VERSION(2, 8, 0)
if(m_pagesInfoVec[cur].GetXRect().Contains(pt))
+#else
+ if(m_pagesInfoVec[cur].GetXRect().Inside(pt))
+#endif
{
pageInfo = pgInfo;
tabIdx = (int)cur;
@@ -1187,7 +1207,11 @@
wxRect tabRect = wxRect(pgInfo.GetPosition().x, pgInfo.GetPosition().y,
pgInfo.GetSize().x, pgInfo.GetSize().y);
+#if wxCHECK_VERSION(2, 8, 0)
if(tabRect.Contains(pt))
+#else
+ if(tabRect.Inside(pt))
+#endif
{
// We have a match
pageInfo = pgInfo;