Update version to 2.9.4 in version.bkl too and rebake everything.

[wxWidgets.git] / src / common / any.cpp

diff --git a/src/common/any.cpp b/src/common/any.cpp
index 9c8549fcdaf7312f29c666504733ab72714fcca8..c8681efec7a01811ab9da4d791563450d39839aa 100644 (file)
--- a/src/common/any.cpp
+++ b/src/common/any.cpp
@@ -152,7 +152,7 @@ bool wxConvertAnyToVariant(const wxAny& any, wxVariant* variant)
         if ( any.GetAs(&ll) )
         {
             // NB: Do not use LONG_MAX here. Explicitly using 32-bit
         if ( any.GetAs(&ll) )
         {
             // NB: Do not use LONG_MAX here. Explicitly using 32-bit

-            //     integer constraint yields more consistent behavior across
+            //     integer constraint yields more consistent behaviour across

             //     builds.
             if ( ll > wxINT32_MAX || ll < wxINT32_MIN )
                 *variant = wxLongLong(ll);
             //     builds.
             if ( ll > wxINT32_MAX || ll < wxINT32_MIN )
                 *variant = wxLongLong(ll);


@@ -516,6 +516,14 @@ public:
         return false;
     }
 
         return false;
     }
 

+#if wxUSE_EXTENDED_RTTI
+    virtual const wxTypeInfo* GetTypeInfo() const
+    {
+        wxFAIL_MSG("Null Type Info not available");
+        return NULL;
+    }
+#endif
+

 private:
 };
 
 private:
 };
 


@@ -524,4 +532,7 @@ WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxAnyNullValue>)
 wxAnyValueType* wxAnyNullValueType =
     wxAnyValueTypeImpl<wxAnyNullValue>::GetInstance();
 
 wxAnyValueType* wxAnyNullValueType =
     wxAnyValueTypeImpl<wxAnyNullValue>::GetInstance();
 

+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxAnyList)
+

 #endif // wxUSE_ANY
 #endif // wxUSE_ANY