X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8348e2cbf34d68fb39ebd279d72a2fc85dafe101..da75a14e72a6455df1f580afd694070c4467449e:/include/wx/xti.h?ds=sidebyside diff --git a/include/wx/xti.h b/include/wx/xti.h index 2eb3e35e22..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 @@ -693,7 +689,7 @@ private : wxString m_name ; } ; -#include +#include "wx/dynarray.h" WX_DECLARE_OBJARRAY_WITH_DECL(wxxVariant, wxxVariantArray, class WXDLLIMPEXP_BASE); @@ -2080,4 +2076,4 @@ template void wxArrayCollectionToVariantArray( const coll } -#endif +#endif // _WX_XTIH__