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:
@@ -13,6 +13,9 @@
|
|||||||
See the comments in beforestd.h.
|
See the comments in beforestd.h.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#if defined(__WXMSW__) && defined(__MINGW32__)
|
||||||
|
#include "wx/msw/winundef.h"
|
||||||
|
#endif
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
# pragma warning(pop)
|
# pragma warning(pop)
|
||||||
#endif
|
#endif
|
||||||
|
@@ -24,9 +24,6 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include "wx/afterstd.h"
|
#include "wx/afterstd.h"
|
||||||
#if defined(__WXMSW__) && defined(__MINGW32__)
|
|
||||||
#include "wx/msw/winundef.h"
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -457,7 +454,7 @@ public: \
|
|||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
#define _WX_DEFINE_SORTED_TYPEARRAY_2(T, name, base, defcomp, classexp, comptype)\
|
#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, \
|
TypeTooBigToBeStoredInSorted##base, \
|
||||||
name); \
|
name); \
|
||||||
classexp name : public base \
|
classexp name : public base \
|
||||||
|
@@ -42,9 +42,6 @@
|
|||||||
#include "wx/beforestd.h"
|
#include "wx/beforestd.h"
|
||||||
#include <list>
|
#include <list>
|
||||||
#include "wx/afterstd.h"
|
#include "wx/afterstd.h"
|
||||||
#if defined(__WXMSW__) && defined(__MINGW32__)
|
|
||||||
#include "wx/msw/winundef.h"
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user