X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6712283cf1b562897bfc36c54da5e03c05f402ed..e4c903b2ea42fe104ef50d0ea6028f14d8309dfa:/include/wx/meta/movable.h

diff --git a/include/wx/meta/movable.h b/include/wx/meta/movable.h
index ada53540e9..8c93487472 100644
--- a/include/wx/meta/movable.h
+++ b/include/wx/meta/movable.h
@@ -11,7 +11,7 @@
 #ifndef _WX_META_MOVABLE_H_
 #define _WX_META_MOVABLE_H_
 
-#include "wx/defs.h"
+#include "wx/meta/pod.h"
 #include "wx/string.h" // for wxIsMovable<wxString> specialization
 
 // Helper to decide if an object of type T is "movable", i.e. if it can be
@@ -21,8 +21,7 @@
 template<typename T>
 struct wxIsMovable
 {
-    // NB: enum, because VC6 can't handle "static const bool value = true;"
-    enum { value = false };
+    wxDEFINE_TEMPLATE_BOOL_VALUE(wxIsPod<T>::value);
 };
 
 // Macro to add wxIsMovable<T> specialization for given type that marks it
@@ -30,49 +29,17 @@ struct wxIsMovable
 #define WX_DECLARE_TYPE_MOVABLE(type)                       \
     template<> struct wxIsMovable<type>                     \
     {                                                       \
-        enum { value = true };                              \
+        wxDEFINE_TEMPLATE_BOOL_VALUE(true);                 \
     };
 
-WX_DECLARE_TYPE_MOVABLE(bool)
-WX_DECLARE_TYPE_MOVABLE(unsigned char)
-WX_DECLARE_TYPE_MOVABLE(signed char)
-WX_DECLARE_TYPE_MOVABLE(unsigned int)
-WX_DECLARE_TYPE_MOVABLE(signed int)
-WX_DECLARE_TYPE_MOVABLE(unsigned short int)
-WX_DECLARE_TYPE_MOVABLE(signed short int)
-WX_DECLARE_TYPE_MOVABLE(signed long int)
-WX_DECLARE_TYPE_MOVABLE(unsigned long int)
-WX_DECLARE_TYPE_MOVABLE(float)
-WX_DECLARE_TYPE_MOVABLE(double)
-WX_DECLARE_TYPE_MOVABLE(long double)
-#if wxWCHAR_T_IS_REAL_TYPE
-WX_DECLARE_TYPE_MOVABLE(wchar_t)
-#endif
-#ifdef wxLongLong_t
-WX_DECLARE_TYPE_MOVABLE(wxLongLong_t)
-WX_DECLARE_TYPE_MOVABLE(wxULongLong_t)
-#endif
-
-// pointers are movable:
-template<typename T>
-struct wxIsMovable<T*>
-{
-    enum { value = true };
-};
-template<typename T>
-struct wxIsMovable<const T*>
-{
-    enum { value = true };
-};
-
 // Our implementation of wxString is written in such way that it's safe to move
-// it around. OTOH, we don't know anything about std::string.
+// it around (unless position cache is used which unfortunately breaks this).
+// OTOH, we don't know anything about std::string.
 // (NB: we don't put this into string.h and choose to include wx/string.h from
 // here instead so that rarely-used wxIsMovable<T> code isn't included by
 // everything)
-#if !wxUSE_STL
+#if !wxUSE_STL && !wxUSE_STRING_POS_CACHE
 WX_DECLARE_TYPE_MOVABLE(wxString)
 #endif
 
-
 #endif // _WX_META_MOVABLE_H_