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

1. wxBase compiles/links again

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
1999-11-26 11:44:01 +00:00
parent 252a752e85
commit e42a6c18c4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/gdiimage.cpp
View File

@@ -32,13 +32,13 @@
#include "wx/string.h" #include "wx/string.h"
#endif // WX_PRECOMP #endif // WX_PRECOMP
#include "wx/msw/private.h"
#include "wx/app.h" #include "wx/app.h"
#include "wx/msw/dib.h" #include "wx/msw/dib.h"
#include "wx/msw/gdiimage.h" #include "wx/msw/gdiimage.h"
#include "wx/msw/private.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// private classes // private classes
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

4
src/msw/tbar95.cpp
View File

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