X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/432968bf3d888547cc88478199cdd9da37109be8..9eb5cd3b1fde80564d9c67afea154448a33836a1:/include/wx/xti.h

diff --git a/include/wx/xti.h b/include/wx/xti.h
index 3bf18e703d..de91e9d8da 100644
--- 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.
@@ -92,7 +88,7 @@ class WXDLLIMPEXP_BASE wxObjectRefData;
 class WXDLLIMPEXP_BASE wxEvent;
 class WXDLLIMPEXP_BASE wxEvtHandler;
 
-typedef void (wxEvtHandler::*wxObjectEventFunction)(wxEvent&);
+typedef void (wxObject::*wxObjectEventFunction)(wxEvent&);
 
 #if wxUSE_FUNC_TEMPLATE_POINTER
 #  define wxTO_STRING(type) wxToStringConverter<type>
@@ -668,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 ;
     }
@@ -692,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);
 
@@ -2079,4 +2076,4 @@ template<typename collection_t> void wxArrayCollectionToVariantArray( const coll
 }
 
 
-#endif
+#endif // _WX_XTIH__