Fix setting wxBK_HITTEST_xxx flags in wxNotebook::HitTest

The state represented by TCHT_ONITEM Win API flag is not a superposition
TCHT_ONITEMICON and TCHT_ONITLABEL states but it represents a separate state.
The fact that binary value of TCHT_ONITEM is bitwise-OR operation on
TCHT_ONITEMICON and TCHT_ONITEMLABEL doesn't matter here. The same applies to
wxBK_HITTEST_xxx flags where state represented by wxBK_HITTEST_ONITEM is not a
superposition of wxBK_HITTEST_ONICON and wxBK_HITTEST_ONLABEL.

Add note to wxBookCtrl::HitTest documentation that wxBK_HITTEST_ONICON,
wxBK_HITTEST_ONLABEL, wxBK_HITTEST_ONITEM are mutually exclusive bits.

See https://github.com/wxWidgets/wxWidgets/pull/159
This commit is contained in:
Artur Wieczorek
2016-01-30 19:09:33 +01:00
committed by Vadim Zeitlin
parent a016e6b896
commit 1237e932ad
3 changed files with 12 additions and 7 deletions

View File

@@ -8,6 +8,8 @@
/**
Bit flags returned by wxBookCtrl::HitTest().
Only one of wxBK_HITTEST_ONICON, wxBK_HITTEST_ONLABEL, wxBK_HITTEST_ONITEM
bits is set if point is over a tab.
Notice that wxOSX currently only returns wxBK_HITTEST_ONLABEL or
wxBK_HITTEST_NOWHERE and never the other values, so you should only test
for these two in the code that should be portable under OS X.
@@ -24,7 +26,7 @@ enum
wxBK_HITTEST_ONLABEL = 4,
/// The point if over a tab item but not over its icon or label.
wxBK_HITTEST_ONITEM = wxBK_HITTEST_ONICON | wxBK_HITTEST_ONLABEL,
wxBK_HITTEST_ONITEM = 16,
/// The point is over the page area.
wxBK_HITTEST_ONPAGE = 8