From aeec2045cf0fd285e12546dc4eceb9440c3dec51 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Sun, 3 Aug 2003 20:14:09 +0000 Subject: [PATCH] Warning fixes (still does not compile). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/set.h | 2 +- include/wx/xti.h | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/include/wx/set.h b/include/wx/set.h index 4462982539..a530a99a53 100644 --- a/include/wx/set.h +++ b/include/wx/set.h @@ -110,4 +110,4 @@ private : }; -#endif \ No newline at end of file +#endif diff --git a/include/wx/xti.h b/include/wx/xti.h index 92464d9920..04187f5519 100644 --- a/include/wx/xti.h +++ b/include/wx/xti.h @@ -40,6 +40,7 @@ #include "wx/memory.h" #include "wx/set.h" #include "wx/string.h" +#include "wx/arrstr.h" class WXDLLIMPEXP_BASE wxObject; class WXDLLIMPEXP_BASE wxClassInfo; @@ -691,7 +692,7 @@ class wxHandlerInfo { public : wxHandlerInfo( wxHandlerInfo* &iter , const wxChar *name , wxObjectEventFunction address , const wxClassInfo* eventClassInfo ) : - m_name( name ) , m_eventClassInfo( eventClassInfo ) , m_eventFunction( address ) + m_eventFunction( address ) , m_name( name ) , m_eventClassInfo( eventClassInfo ) { m_next = NULL ; if ( iter == NULL ) @@ -918,16 +919,21 @@ public: const int _ConstructorPropertiesCount , wxVariantToObjectConverter _Converter1 , wxObjectToVariantConverter _Converter2 - ) : m_parents(_Parents) , m_unitName(_UnitName) ,m_className(_ClassName), - m_objectSize(size), m_objectConstructor(ctor) , m_firstProperty(_Props ) , m_firstHandler(_Handlers ) , m_constructor( _Constructor ) , - m_constructorProperties(_ConstructorProperties) , m_constructorPropertiesCount(_ConstructorPropertiesCount), - m_variantToObjectConverter( _Converter1 ) , m_objectToVariantConverter( _Converter2 ) , m_next(sm_first) + ) : m_className(_ClassName), m_objectSize(size), + m_objectConstructor(ctor), m_next(sm_first), + m_parents(_Parents), m_firstProperty(_Props ), + m_firstHandler(_Handlers), m_unitName(_UnitName), + m_constructor( _Constructor ), + m_constructorProperties(_ConstructorProperties), + m_constructorPropertiesCount(_ConstructorPropertiesCount), + m_variantToObjectConverter( _Converter1 ), + m_objectToVariantConverter( _Converter2 ) { sm_first = this; Register( m_className , this ) ; } - ~wxClassInfo() ; + virtual ~wxClassInfo() ; wxObject *CreateObject() { return m_objectConstructor ? (*m_objectConstructor)() : 0; } @@ -1190,4 +1196,4 @@ const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NUL #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2 -#endif \ No newline at end of file +#endif