AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-11-12 14:50:29 +00:00
parent 43c9c17dfb
commit 4e15f6c57a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/tbar95.cpp
View File

@ -32,6 +32,7 @@
#include "wx/log.h" #include "wx/log.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/dynarray.h" #include "wx/dynarray.h"
#include "wx/settings.h"
#endif #endif
#if wxUSE_BUTTONBAR && wxUSE_TOOLBAR && defined(__WIN95__) #if wxUSE_BUTTONBAR && wxUSE_TOOLBAR && defined(__WIN95__)
@ -397,6 +398,8 @@ bool wxToolBar95::CreateTools()
delete [] buttons; delete [] buttons;
// TBBUTTONINFO struct declaration is missing from mingw32 headers
#ifndef __GNUWIN32__
// 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++ )
@ -439,6 +442,7 @@ bool wxToolBar95::CreateTools()
control->Move(r.left, r.top + diff / 2); control->Move(r.left, r.top + diff / 2);
} }
#endif // __GNUWIN32__
(void)::SendMessage(GetHwnd(), TB_AUTOSIZE, (WPARAM)0, (LPARAM) 0); (void)::SendMessage(GetHwnd(), TB_AUTOSIZE, (WPARAM)0, (LPARAM) 0);