Define wxUSE_CAIRO in wx/chkconf.h to ensure that it's always defined.

[wxWidgets.git] / include / wx / any.h

diff --git a/include/wx/any.h b/include/wx/any.h
index 52d8480b66bc4510df27fd0ecf6ef6ef42e4bb8c..b99e84bb99ae987a5caf0d942eb5f576f69cde4c 100644 (file)
--- a/include/wx/any.h
+++ b/include/wx/any.h
@@ -19,6 +19,7 @@
 #include "wx/string.h"
 #include "wx/meta/movable.h"
 #include "wx/meta/if.h"
 #include "wx/string.h"
 #include "wx/meta/movable.h"
 #include "wx/meta/if.h"

+#include "wx/typeinfo.h"

 
 
 // Size of the wxAny value buffer.
 
 
 // Size of the wxAny value buffer.


@@ -43,9 +44,6 @@ union wxAnyValueBuffer
     wxByte  m_buffer[WX_ANY_VALUE_BUFFER_SIZE];
 };
 
     wxByte  m_buffer[WX_ANY_VALUE_BUFFER_SIZE];
 };
 

-typedef void (*wxAnyClassInfo)();
-
-

 //
 // wxAnyValueType is base class for value type functionality for C++ data
 // types used with wxAny. Usually the default template (wxAnyValueTypeImpl<>)
 //
 // wxAnyValueType is base class for value type functionality for C++ data
 // types used with wxAny. Usually the default template (wxAnyValueTypeImpl<>)


@@ -53,6 +51,7 @@ typedef void (*wxAnyClassInfo)();
 //
 class WXDLLIMPEXP_BASE wxAnyValueType
 {
 //
 class WXDLLIMPEXP_BASE wxAnyValueType
 {

+    WX_DECLARE_ABSTRACT_TYPEINFO(wxAnyValueType)

 public:
     /**
         Default constructor.
 public:
     /**
         Default constructor.


@@ -66,11 +65,6 @@ public:
     {
     }
 
     {
     }
 

-    /**
-        This function is used for internal type matching.
-    */
-    virtual wxAnyClassInfo GetClassInfo() const = 0;
-

     /**
         This function is used for internal type matching.
     */
     /**
         This function is used for internal type matching.
     */


@@ -125,28 +119,22 @@ private:
 #define wxANY_VALUE_TYPE_CHECK_TYPE(valueTypePtr, T) \
     wxAnyValueTypeImpl<T>::IsSameClass(valueTypePtr)
 
 #define wxANY_VALUE_TYPE_CHECK_TYPE(valueTypePtr, T) \
     wxAnyValueTypeImpl<T>::IsSameClass(valueTypePtr)
 

-    //valueTypePtr->CheckType(static_cast<T*>(NULL))
-

 
 /**
     Helper macro for defining user value types.
 
 
 /**
     Helper macro for defining user value types.
 

-    NB: We really cannot compare sm_classInfo directly in IsSameClass(),
-        but instead call sm_instance->GetClassInfo(). The former technique
-        broke at least on GCC 4.2 (but worked on VC8 shared build).
+    Even though C++ RTTI would be fully available to use, we'd have to to
+    facilitate sub-type system which allows, for instance, wxAny with
+    signed short '15' to be treated equal to wxAny with signed long long '15'.
+    Having sm_instance is important here.

 */
 #define WX_DECLARE_ANY_VALUE_TYPE(CLS) \
     friend class wxAny; \
 */
 #define WX_DECLARE_ANY_VALUE_TYPE(CLS) \
     friend class wxAny; \

+    WX_DECLARE_TYPEINFO_INLINE(CLS) \

 public: \
 public: \

-    static void sm_classInfo() {} \
- \
-    virtual wxAnyClassInfo GetClassInfo() const \
-    { \
-        return sm_classInfo; \
-    } \

     static bool IsSameClass(const wxAnyValueType* otherType) \
     { \
     static bool IsSameClass(const wxAnyValueType* otherType) \
     { \

-        return sm_instance->GetClassInfo() == otherType->GetClassInfo(); \
+        return wxTypeId(*sm_instance) == wxTypeId(*otherType); \

     } \
     virtual bool IsSameType(const wxAnyValueType* otherType) const \
     { \
     } \
     virtual bool IsSameType(const wxAnyValueType* otherType) const \
     { \