From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 8 Jun 2005 21:28:29 +0000 (+0000)
Subject: test for TB_SETBUTTONINFO instead of _WIN32_IE in wxToolBar::FindToolForPosition... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a84f66ef20c8c8f2297b90b66afa19a0e38ffcba

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


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

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