X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbca59a8fb340a4ed288eed5fad9589df63c49ec..e9e8b38179b147dd04f5c19af7e56a94342e93a7:/include/wx/defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 14afcf2f7e..6130fae99b 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1075,6 +1075,9 @@ typedef wxUint32 wxDword;
 
     #define wxHAS_INT64 1
 
+    #ifndef wxLongLongIsLong
+        #define wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
+    #endif
 #elif wxUSE_LONGLONG
     /*  these macros allow to define 64 bit constants in a portable way */
     #define wxLL(x) wxLongLong(x)
@@ -1440,7 +1443,7 @@ typedef double wxDouble;
 #endif
 
 /*  ---------------------------------------------------------------------------- */
-/*  XTI workarounds for dummy compilers */
+/*  template workarounds for buggy compilers */
 /*  ---------------------------------------------------------------------------- */
 
 #if defined(__GNUC__) && !wxCHECK_GCC_VERSION( 3, 4 )
@@ -1478,56 +1481,6 @@ typedef double wxDouble;
 #  define wxINFUNC_CLASS_TYPE_FIX( type )
 #endif
 
-#if wxUSE_FUNC_TEMPLATE_POINTER
-#  define wxTO_STRING(type) wxToStringConverter<type>
-#  define wxTO_STRING_IMP(type)
-#  define wxFROM_STRING(type) wxFromStringConverter<type>
-#  define wxFROM_STRING_IMP(type)
-#else
-#  define wxTO_STRING(type) ToString##type
-#  define wxTO_STRING_IMP(type) \
-    inline void ToString##type( const wxAny& data, wxString &result ) \
-        { wxToStringConverter<type>(data, result); }
-
-#  define wxFROM_STRING(type) FromString##type
-#  define wxFROM_STRING_IMP(type) \
-    inline void FromString##type( const wxString& data, wxAny &result ) \
-        { wxFromStringConverter<type>(data, result); }
-#endif
-
-// XTI helper macro. This one is used both by xti.h and rtti.h and
-// thus needs to go in a common header to avoid redundancy.
-#define wxDECLARE_CLASS_INFO_ITERATORS()                                     \
-    class WXDLLIMPEXP_BASE const_iterator                                    \
-    {                                                                        \
-        typedef wxHashTable_Node Node;                                       \
-    public:                                                                  \
-        typedef const wxClassInfo* value_type;                               \
-        typedef const value_type& const_reference;                           \
-        typedef const_iterator itor;                                         \
-        typedef value_type* ptr_type;                                        \
-                                                                             \
-        Node* m_node;                                                        \
-        wxHashTable* m_table;                                                \
-    public:                                                                  \
-        typedef const_reference reference_type;                              \
-        typedef ptr_type pointer_type;                                       \
-                                                                             \
-        const_iterator(Node* node, wxHashTable* table)                       \
-            : m_node(node), m_table(table) { }                               \
-        const_iterator() : m_node(NULL), m_table(NULL) { }                   \
-        value_type operator*() const;                                        \
-        itor& operator++();                                                  \
-        const itor operator++(int);                                          \
-        bool operator!=(const itor& it) const                                \
-            { return it.m_node != m_node; }                                  \
-        bool operator==(const itor& it) const                                \
-            { return it.m_node == m_node; }                                  \
-    };                                                                       \
-                                                                             \
-    static const_iterator begin_classinfo();                                 \
-    static const_iterator end_classinfo()
-
 /*  ---------------------------------------------------------------------------- */
 /*  Geometric flags */
 /*  ---------------------------------------------------------------------------- */