test whether pointer is non-NULL before using it, not after, in wxAnimation::Load...

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

diff --git a/include/wx/xti.h b/include/wx/xti.h
index c2e3b87d0d769bd16dc740584100b9698ec5c451..f0ddc31b60e9f41e67d21ad9e9257ffe40d6284e 100644 (file)
--- a/include/wx/xti.h
+++ b/include/wx/xti.h
@@ -13,10 +13,6 @@
 #ifndef _WX_XTIH__
 #define _WX_XTIH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "xti.h"
-#endif
-
 // We want to support properties, event sources and events sinks through
 // explicit declarations, using templates and specialization to make the
 // effort as painless as possible.
@@ -90,6 +86,7 @@ class WXDLLIMPEXP_BASE wxDynamicClassInfo;
 class WXDLLIMPEXP_BASE wxHashTable;
 class WXDLLIMPEXP_BASE wxObjectRefData;
 class WXDLLIMPEXP_BASE wxEvent;
+class WXDLLIMPEXP_BASE wxEvtHandler;
 
 typedef void (wxObject::*wxObjectEventFunction)(wxEvent&);
 
@@ -243,7 +240,7 @@ void wxSetToString( wxString &s , const wxBitset<e> &data )
         if ( data.test( value ) )
         {
             // this could also be done by the templated calls
-            if ( !s.IsEmpty() )
+            if ( !s.empty() )
                 s +=wxT("|") ;
             s += edata->GetEnumMemberNameByIndex(i) ;
         }
@@ -303,7 +300,7 @@ void wxFlagsToString( wxString &s , const e& data )
             // clear the flags we just set
             dataValue &= ~value ;
             // this could also be done by the templated calls
-            if ( !s.IsEmpty() )
+            if ( !s.empty() )
                 s +=wxT("|") ;
             s += edata->GetEnumMemberNameByIndex(i) ;
         }
@@ -667,7 +664,8 @@ public :
 
     wxxVariant& operator=(const wxxVariant &d)
     {
-        m_data = d.m_data->Clone() ;
+        delete m_data;
+        m_data = d.m_data ? d.m_data->Clone() : NULL ;
         m_name = d.m_name ;
         return *this ;
     }
@@ -691,7 +689,7 @@ private :
     wxString m_name ;
 } ;
 
-#include <wx/dynarray.h>
+#include "wx/dynarray.h"
 
 WX_DECLARE_OBJARRAY_WITH_DECL(wxxVariant, wxxVariantArray, class WXDLLIMPEXP_BASE);
 
@@ -770,7 +768,7 @@ class wxSetter##property : public wxSetter \
 public: \
     wxINFUNC_CLASS_TYPE_FIX(Klass) \
     wxSetter##property() : wxSetter( wxT(#setterMethod) ) {} \
-    ~wxSetter##property() {} \
+    virtual ~wxSetter##property() {} \
     void Set( wxObject *object, const wxxVariant &variantValue ) const \
 { \
     Klass *obj = dynamic_cast<Klass*>(object) ;  \
@@ -787,7 +785,7 @@ class wxGetter##property : public wxGetter \
 public : \
     wxINFUNC_CLASS_TYPE_FIX(Klass) \
     wxGetter##property() : wxGetter( wxT(#gettermethod) ) {} \
-    ~wxGetter##property() {} \
+    virtual ~wxGetter##property() {} \
     void Get( const wxObject *object , wxxVariant &result) const \
 { \
     const Klass *obj = dynamic_cast<const Klass*>(object) ;  \
@@ -801,7 +799,7 @@ class wxAdder##property : public wxAdder \
 public: \
     wxINFUNC_CLASS_TYPE_FIX(Klass) \
     wxAdder##property() : wxAdder( wxT(#addermethod) ) {} \
-    ~wxAdder##property() {} \
+    virtual ~wxAdder##property() {} \
     void Add( wxObject *object, const wxxVariant &variantValue ) const \
 { \
     Klass *obj = dynamic_cast<Klass*>(object) ;  \
@@ -818,7 +816,7 @@ class wxCollectionGetter##property : public wxCollectionGetter \
 public : \
     wxINFUNC_CLASS_TYPE_FIX(Klass) \
     wxCollectionGetter##property() : wxCollectionGetter( wxT(#gettermethod) ) {} \
-    ~wxCollectionGetter##property() {} \
+    virtual ~wxCollectionGetter##property() {} \
     void Get( const wxObject *object , wxxVariantArray &result) const \
 { \
     const Klass *obj = dynamic_cast<const Klass*>(object) ;  \
@@ -875,7 +873,7 @@ class WXDLLIMPEXP_BASE wxGenericPropertyAccessor : public wxPropertyAccessor
 {
 public :
     wxGenericPropertyAccessor( const wxString &propName ) ;
-    ~wxGenericPropertyAccessor() ;
+    virtual ~wxGenericPropertyAccessor() ;
 
     void RenameProperty( const wxString& WXUNUSED_UNLESS_DEBUG(oldName),
         const wxString& newName )
@@ -1401,6 +1399,28 @@ struct wxConstructorBridge_3 : public wxConstructorBridge
     const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  } ; \
     const int klass::ms_constructorPropertiesCount = 3 ;
 
+// direct constructor version
+
+template<typename Class,
+typename T0, typename T1, typename T2>
+struct wxDirectConstructorBridge_3 : public wxDirectConstructorBrigde
+{
+    void Create(wxObject * &o, wxxVariant *args)
+    {
+        o = new Class(
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
+            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2)
+            );
+    }
+};
+
+#define wxDIRECT_CONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \
+    wxDirectConstructorBridge_3<klass,t0,t1,t2> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1) , wxT(#v2) } ; \
+    const int klass::ms_constructorPropertiesCount = 3;
+
 // 4 params
 
 template<typename Class,
@@ -1663,6 +1683,7 @@ public:
     const wxChar       *GetIncludeName() const { return m_unitName ; }
     const wxClassInfo **GetParents() const { return m_parents; }
     int                 GetSize() const { return m_objectSize; }
+    bool                IsDynamic() const { return (NULL != m_objectConstructor); }
 
     wxObjectConstructorFn      GetConstructor() const { return m_objectConstructor; }
     static const wxClassInfo  *GetFirst() { return sm_first; }
@@ -1698,12 +1719,6 @@ public:
     // gets the streaming callback from this class or any superclass
     wxObjectStreamingCallback GetStreamingCallback() const ;
 
-#if WXWIN_COMPATIBILITY_2_4
-    // Initializes parent pointers and hash table for fast searching.
-    wxDEPRECATED( static void InitializeClasses() );
-    // Cleans up hash table used for fast searching.
-    wxDEPRECATED( static void CleanUpClasses() );
-#endif
     static void CleanUp();
 
     // returns the first property
@@ -1974,7 +1989,7 @@ private :
 
 #define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_NO_BASE_XTI( name , unit ) \
     const wxClassInfo* name::ms_classParents[] = { NULL } ; \
-    wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name),   \
+    wxClassInfo name::ms_classInfo(name::ms_classParents , wxEmptyString , wxT(#name),   \
     (int) sizeof(name),                              \
     (wxObjectConstructorFn) 0   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
@@ -1985,7 +2000,7 @@ private :
 
 #define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_XTI( name , basename, unit ) \
     const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
-    wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name),   \
+    wxClassInfo name::ms_classInfo(name::ms_classParents , wxEmptyString , wxT(#name),   \
     (int) sizeof(name),                              \
     (wxObjectConstructorFn) 0   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
@@ -2030,7 +2045,7 @@ private :
     wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
     wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
     wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
-    wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name),   \
+    wxClassInfo name::ms_classInfo(name::ms_classParents , wxEmptyString , wxT(#name),   \
     (int) sizeof(name),                              \
     (wxObjectConstructorFn) 0   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
@@ -2078,4 +2093,4 @@ template<typename collection_t> void wxArrayCollectionToVariantArray( const coll
 }
 
 
-#endif
+#endif // _WX_XTIH__