X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d0a84b63384ca1c1d8d20581fb56abbd1d826617..e87f080a8809a36b9fd05f5f9b3d8436dac017c3:/src/generic/toolbkg.cpp diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp index 0822ab0ae8..0ae9b0b607 100644 --- a/src/generic/toolbkg.cpp +++ b/src/generic/toolbkg.cpp @@ -95,7 +95,7 @@ bool wxToolbook::Create(wxWindow *parent, orient = wxTB_VERTICAL; // TODO: make more configurable - + #if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON if (style & wxBK_BUTTONBAR) { @@ -314,7 +314,7 @@ int wxToolbook::HitTest(const wxPoint& pt, long *flags) const int pagePos = wxNOT_FOUND; if ( flags ) - *flags = wxNB_HITTEST_NOWHERE; + *flags = wxBK_HITTEST_NOWHERE; // convert from wxToolbook coordinates to wxToolBar ones const wxToolBarBase * const tbar = GetToolBar(); @@ -330,13 +330,13 @@ int wxToolbook::HitTest(const wxPoint& pt, long *flags) const { pagePos = tbar->GetToolPos(tool->GetId()); if ( flags ) - *flags = wxNB_HITTEST_ONICON | wxNB_HITTEST_ONLABEL; + *flags = wxBK_HITTEST_ONICON | wxBK_HITTEST_ONLABEL; } } else // not over the toolbar { if ( flags && GetPageRect().Inside(pt) ) - *flags |= wxNB_HITTEST_ONPAGE; + *flags |= wxBK_HITTEST_ONPAGE; } return pagePos;