wxHtmlWindow::OnLinkClicked and wxHtmlCell::Get/SetLink and wxHtmlWinParser::GetSetLi...

[wxWidgets.git] / src / msw / tbar95.cpp

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 77bc8885dc710da1ca61c44f1d985079226aefea..d60c8baa0f154b84359ff341c616d3e5660c2ea1 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -49,7 +49,10 @@
 
 #ifndef __TWIN32__
 
-#ifdef __GNUWIN32_OLD__
+// I don't know what _OLD_ refers to so I'm reinstating the old
+// ifdef (JACS).
+// #ifdef __GNUWIN32_OLD__
+#if defined(__GNUWIN32__) && !defined(__MINGW32__)
     #include "wx/msw/gnuwin32/extra.h"
 #else
     #include <commctrl.h>
@@ -199,7 +202,10 @@ bool wxToolBar::Create(wxWindow *parent,
     DWORD msflags = 0;      // WS_VISIBLE | WS_CHILD always included
     if (style & wxBORDER)
         msflags |= WS_BORDER;
+
+#ifdef TBSTYLE_TOOLTIPS
     msflags |= TBSTYLE_TOOLTIPS;
+#endif
 
     if (style & wxTB_FLAT)
     {