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

Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-06-01 13:50:55 +00:00
parent 7408cf7f76
commit ef094fa075
2 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/msw/notebook.cpp
View File

@@ -468,25 +468,6 @@ bool wxNotebook::InsertPage(int nPage,
// finally do insert it
if ( TabCtrl_InsertItem(m_hwnd, nPage, &tcItem) == -1 )
{
// Hit test
int wxNotebook::HitTest(const wxPoint& pt, long& flags)
{
TC_HITTESTINFO hitTestInfo;
hitTestInfo.pt.x = pt.x;
hitTestInfo.pt.y = pt.y;
int item = TabCtrl_HitTest( (HWND) GetHWND(), & hitTestInfo ) ;
flags = 0;
if ((hitTestInfo.flags & TCHT_NOWHERE) == TCHT_NOWHERE)
flags |= wxNB_HITTEST_NOWHERE;
if ((hitTestInfo.flags & TCHT_ONITEMICON) == TCHT_ONITEMICON)
flags |= wxNB_HITTEST_ONICON;
if ((hitTestInfo.flags & TCHT_ONITEMLABEL) == TCHT_ONITEMLABEL)
flags |= wxNB_HITTEST_ONLABEL;
return item;
}
wxLogError(wxT("Can't create the notebook page '%s'."), strText.c_str());
return FALSE;
@@ -538,6 +519,25 @@ int wxNotebook::HitTest(const wxPoint& pt, long& flags)
return TRUE;
}
// Hit test
int wxNotebook::HitTest(const wxPoint& pt, long& flags)
{
TC_HITTESTINFO hitTestInfo;
hitTestInfo.pt.x = pt.x;
hitTestInfo.pt.y = pt.y;
int item = TabCtrl_HitTest( (HWND) GetHWND(), & hitTestInfo ) ;
flags = 0;
if ((hitTestInfo.flags & TCHT_NOWHERE) == TCHT_NOWHERE)
flags |= wxNB_HITTEST_NOWHERE;
if ((hitTestInfo.flags & TCHT_ONITEMICON) == TCHT_ONITEMICON)
flags |= wxNB_HITTEST_ONICON;
if ((hitTestInfo.flags & TCHT_ONITEMLABEL) == TCHT_ONITEMLABEL)
flags |= wxNB_HITTEST_ONLABEL;
return item;
}
// ----------------------------------------------------------------------------
// wxNotebook callbacks
// ----------------------------------------------------------------------------