cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Warning fixes (still does not compile).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon 2003-08-03 20:14:09 +00:00
parent b96f9d1928
commit aeec2045cf
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/set.h
View File

@ -110,4 +110,4 @@ private :
}; };
#endif #endif

20
include/wx/xti.h
View File

@ -40,6 +40,7 @@
#include "wx/memory.h" #include "wx/memory.h"
#include "wx/set.h" #include "wx/set.h"
#include "wx/string.h" #include "wx/string.h"
#include "wx/arrstr.h"
class WXDLLIMPEXP_BASE wxObject; class WXDLLIMPEXP_BASE wxObject;
class WXDLLIMPEXP_BASE wxClassInfo; class WXDLLIMPEXP_BASE wxClassInfo;
@ -691,7 +692,7 @@ class wxHandlerInfo
{ {
public : public :
wxHandlerInfo( wxHandlerInfo* &iter , const wxChar *name , wxObjectEventFunction address , const wxClassInfo* eventClassInfo ) : 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 ; m_next = NULL ;
if ( iter == NULL ) if ( iter == NULL )
@ -918,16 +919,21 @@ public:
const int _ConstructorPropertiesCount , const int _ConstructorPropertiesCount ,
wxVariantToObjectConverter _Converter1 , wxVariantToObjectConverter _Converter1 ,
wxObjectToVariantConverter _Converter2 wxObjectToVariantConverter _Converter2
) : m_parents(_Parents) , m_unitName(_UnitName) ,m_className(_ClassName), ) : m_className(_ClassName), m_objectSize(size),
m_objectSize(size), m_objectConstructor(ctor) , m_firstProperty(_Props ) , m_firstHandler(_Handlers ) , m_constructor( _Constructor ) , m_objectConstructor(ctor), m_next(sm_first),
m_constructorProperties(_ConstructorProperties) , m_constructorPropertiesCount(_ConstructorPropertiesCount), m_parents(_Parents), m_firstProperty(_Props ),
m_variantToObjectConverter( _Converter1 ) , m_objectToVariantConverter( _Converter2 ) , m_next(sm_first) m_firstHandler(_Handlers), m_unitName(_UnitName),
m_constructor( _Constructor ),
m_constructorProperties(_ConstructorProperties),
m_constructorPropertiesCount(_ConstructorPropertiesCount),
m_variantToObjectConverter( _Converter1 ),
m_objectToVariantConverter( _Converter2 )
{ {
sm_first = this; sm_first = this;
Register( m_className , this ) ; Register( m_className , this ) ;
} }
~wxClassInfo() ; virtual ~wxClassInfo() ;
wxObject *CreateObject() { return m_objectConstructor ? (*m_objectConstructor)() : 0; } 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_CLASS IMPLEMENT_ABSTRACT_CLASS
#define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
#endif #endif