From 431346ff02c3ecbbd9160fe039da812002b0680e Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 5 Aug 2003 19:22:28 +0000 Subject: [PATCH] bcc32 needs some more specializations git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/object.cpp | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/common/object.cpp b/src/common/object.cpp index b66a33ab71..e39d06cdbb 100644 --- a/src/common/object.cpp +++ b/src/common/object.cpp @@ -52,22 +52,26 @@ #endif #if wxUSE_EXTENDED_RTTI -const wxClassInfo* wxObject::sm_classParentswxObject[] = { NULL } ; - wxObject* wxVariantToObjectConverterwxObject ( wxxVariant &data ) -{ return data.Get() ; } - wxObject* wxVariantOfPtrToObjectConverterwxObject ( wxxVariant &data ) -{ return &data.Get() ; } - wxxVariant wxObjectToVariantConverterwxObject ( wxObject *data ) +const wxClassInfo* wxObject::sm_classParentswxObject[] = { NULL } ; + wxObject* wxVariantToObjectConverterwxObject ( wxxVariant &data ) +{ return data.Get() ; } + wxObject* wxVariantOfPtrToObjectConverterwxObject ( wxxVariant &data ) +{ return &data.Get() ; } + wxxVariant wxObjectToVariantConverterwxObject ( wxObject *data ) { return wxxVariant( dynamic_cast (data) ) ; } - wxClassInfo wxObject::sm_classwxObject(sm_classParentswxObject , wxT("") , wxT("wxObject"), + wxClassInfo wxObject::sm_classwxObject(sm_classParentswxObject , wxT("") , wxT("wxObject"), (int) sizeof(wxObject), \ - (wxObjectConstructorFn) 0 , - (wxPropertyInfo*) NULL,(wxHandlerInfo*) NULL,0 , 0 , - 0 , wxVariantOfPtrToObjectConverterwxObject , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject); + (wxObjectConstructorFn) 0 , + (wxPropertyInfo*) NULL,(wxHandlerInfo*) NULL,0 , 0 , + 0 , wxVariantOfPtrToObjectConverterwxObject , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject); template<> void wxStringReadValue(const wxString & , wxObject * & ){assert(0) ;} template<> void wxStringWriteValue(wxString & , wxObject* const & ){assert(0) ;} + template<> void wxStringReadValue(const wxString & , wxObject & ){assert(0) ;} + template<> void wxStringWriteValue(wxString & , wxObject const & ){assert(0) ;} template<> const wxTypeInfo* wxGetTypeInfo( wxObject ** ) { static wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &wxObject::sm_classwxObject) ; return &s_typeInfo ; } + template<> const wxTypeInfo* wxGetTypeInfo( wxObject * ) + { static wxClassTypeInfo s_typeInfo(wxT_OBJECT , &wxObject::sm_classwxObject) ; return &s_typeInfo ; } #else wxClassInfo wxObject::sm_classwxObject( wxT("wxObject"), 0, 0, (int) sizeof(wxObject),