Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxNB_HITTEST_* flags renamed to wxBK_HITTEST_* to serve all book controls.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-07-05 12:21:13 +00:00
parent 84dc000666
commit 9804d5404a
13 changed files with 66 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/generic/toolbkg.cpp
View File

@@ -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;