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

diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h
index 313c2257a2afecaac57e4551c208a3dfc5a932ce..a840f06f813b1a4e8e29beadf69e16cf5d2ad2c6 100644 (file)
--- a/include/wx/afterstd.h
+++ b/include/wx/afterstd.h
@@ -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
 #   pragma warning(pop)
 #endif
 #ifdef _MSC_VER
 #   pragma warning(pop)
 #endif

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index 3228aee579c9f13b9f7c0bc5152be7aa290f73f0..b836cffb729ffea5e3a7d320cb64e81788401305 100644 (file)
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -24,9 +24,6 @@
     #include <vector>
     #include <algorithm>
     #include "wx/afterstd.h"
     #include <vector>
     #include <algorithm>
     #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,            \
                        name);                                         \
 classexp name : public base                                           \
                        TypeTooBigToBeStoredInSorted##base,            \
                        name);                                         \
 classexp name : public base                                           \

diff --git a/include/wx/list.h b/include/wx/list.h
index 43316ca914f505fa91c8d4f54c7d26e2efded352..ffddd09a581ec24af774e10dfad03e0414c14684 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -42,9 +42,6 @@
     #include "wx/beforestd.h"
     #include <list>
     #include "wx/afterstd.h"
     #include "wx/beforestd.h"
     #include <list>
     #include "wx/afterstd.h"

-    #if defined(__WXMSW__) && defined(__MINGW32__)
-        #include "wx/msw/winundef.h"
-    #endif

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------