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

test for TB_SETBUTTONINFO instead of _WIN32_IE in wxToolBar::FindToolForPosition(), this fixes crash with older compilers/DSK headers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-06-08 21:28:29 +00:00
parent 4edb3b83fb
commit a84f66ef20
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/msw/tbar95.cpp
View File

@@ -1246,14 +1246,15 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
return (wxToolBarToolBase *)NULL; return (wxToolBarToolBase *)NULL;
} }
// if comctl32 version < 4.71 wxToolBar95 adds dummy spacers // when TB_SETBUTTONINFO is available (both during compile- and run-time),
#if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 ) // we don't use the dummy separators hack
#ifdef TB_SETBUTTONINFO
if ( wxApp::GetComCtl32Version() >= 471 ) if ( wxApp::GetComCtl32Version() >= 471 )
{ {
return m_tools.Item((size_t)index)->GetData(); return m_tools.Item((size_t)index)->GetData();
} }
else else
#endif #endif // TB_SETBUTTONINFO
{ {
return GetItemSkippingDummySpacers( m_tools, (size_t) index ); return GetItemSkippingDummySpacers( m_tools, (size_t) index );
} }