1. wxBase compiles/links again

2. wxString::reserve() (STLese for Alloc()) added
3. compilation fixes for mingw32/BC++

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

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index d8015b11e36e0d96f8047ea193c39b162add81fa..ae1820d19a3a42ce089f536f95e0fd1159b2955a 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -32,13 +32,13 @@
     #include "wx/string.h"
 #endif // WX_PRECOMP
 
+#include "wx/msw/private.h"
+
 #include "wx/app.h"
 
 #include "wx/msw/dib.h"
 #include "wx/msw/gdiimage.h"
 
-#include "wx/msw/private.h"
-
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index aa23d55899e004397232c2c1308a72d80c9334bc..aa2ce7f68306045cda3fd4bfc74e7567d70542ba 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -398,8 +398,8 @@ bool wxToolBar95::CreateTools()
 
     delete [] buttons;
 
-    // TBBUTTONINFO struct declaration is missing from mingw32 headers
-#if !defined(__GNUWIN32__) && !defined(__WATCOMC__)
+    // TBBUTTONINFO struct declaration is new (comctl32.dll 4.70+)
+#if !defined(__GNUWIN32__) && !defined(__WATCOMC__) && !defined(__BORLANDC__)
     // adjust the controls size to fit nicely in the toolbar
     size_t nControls = controlIds.GetCount();
     for ( size_t nCtrl = 0; nCtrl < nControls; nCtrl++ )