From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 12 Nov 1999 14:50:29 +0000 (+0000)
Subject: mingw32 compilation fixes (unfortunately, this effectively disables placing controls... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4e15f6c57a5897f0e1e332100e4261fd84167ce0?ds=inline

mingw32 compilation fixes (unfortunately, this effectively disables placing controls into the toolbar)


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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 6617cd587a..64ca4f176c 100644
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -32,6 +32,7 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/dynarray.h"
+    #include "wx/settings.h"
 #endif
 
 #if wxUSE_BUTTONBAR && wxUSE_TOOLBAR && defined(__WIN95__)
@@ -397,6 +398,8 @@ bool wxToolBar95::CreateTools()
 
     delete [] buttons;
 
+    // TBBUTTONINFO struct declaration is missing from mingw32 headers
+#ifndef __GNUWIN32__
     // adjust the controls size to fit nicely in the toolbar
     size_t nControls = controlIds.GetCount();
     for ( size_t nCtrl = 0; nCtrl < nControls; nCtrl++ )
@@ -439,6 +442,7 @@ bool wxToolBar95::CreateTools()
 
         control->Move(r.left, r.top + diff / 2);
     }
+#endif // __GNUWIN32__
 
     (void)::SendMessage(GetHwnd(), TB_AUTOSIZE, (WPARAM)0, (LPARAM) 0);