Move #inclusion of wx/msw/winundef.h for MinGW to afterstd.h.

Fix WX_DEFINE_TYPEARRAY assert to refer to base array's elemnt type
rather than to void*.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon 2003-07-13 20:07:45 +00:00
parent 5109ae5d17
commit 335991afa5
3 changed files with 4 additions and 7 deletions

View File

@ -13,6 +13,9 @@
See the comments in beforestd.h.
*/
#if defined(__WXMSW__) && defined(__MINGW32__)
#include "wx/msw/winundef.h"
#endif
#ifdef _MSC_VER
# pragma warning(pop)
#endif

View File

@ -24,9 +24,6 @@
#include <vector>
#include <algorithm>
#include "wx/afterstd.h"
#if defined(__WXMSW__) && defined(__MINGW32__)
#include "wx/msw/winundef.h"
#endif
#endif
/*
@ -457,7 +454,7 @@ public: \
// ----------------------------------------------------------------------------
#define _WX_DEFINE_SORTED_TYPEARRAY_2(T, name, base, defcomp, classexp, comptype)\
wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(void *), \
wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(base::base_type), \
TypeTooBigToBeStoredInSorted##base, \
name); \
classexp name : public base \

View File

@ -42,9 +42,6 @@
#include "wx/beforestd.h"
#include <list>
#include "wx/afterstd.h"
#if defined(__WXMSW__) && defined(__MINGW32__)
#include "wx/msw/winundef.h"
#endif
#endif
// ----------------------------------------------------------------------------