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

VC6 template fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-10-19 13:41:33 +00:00
parent 728b21e56c
commit 2c4c398782
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/wx/xti.h
View File

@@ -148,7 +148,7 @@ private :
s = s_enumData##e.GetEnumMemberName((int)data) ; \ s = s_enumData##e.GetEnumMemberName((int)data) ; \
} \ } \
void FromLong##e( long data , wxxVariant& result ) { result = wxxVariant((e)data) ;} \ void FromLong##e( long data , wxxVariant& result ) { result = wxxVariant((e)data) ;} \
void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.Get<e>() ;} \ void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.wxTEMPLATED_MEMBER_CALL(Get , e) ;} \
wxEnumTypeInfo s_typeInfo##e(wxT_ENUM , &s_enumData##e , &wxToStringConverter<e> , &wxFromStringConverter<e> , &ToLong##e , &FromLong##e , typeid(e).name() ) ; wxEnumTypeInfo s_typeInfo##e(wxT_ENUM , &s_enumData##e , &wxToStringConverter<e> , &wxFromStringConverter<e> , &ToLong##e , &FromLong##e , typeid(e).name() ) ;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -233,7 +233,7 @@ void wxSetToString( wxString &s , const wxBitset<e> &data )
wxSetToString( s , data ) ; \ wxSetToString( s , data ) ; \
} \ } \
void FromLong##SetName( long data , wxxVariant& result ) { result = wxxVariant(SetName((unsigned long)data)) ;} \ void FromLong##SetName( long data , wxxVariant& result ) { result = wxxVariant(SetName((unsigned long)data)) ;} \
void ToLong##SetName( const wxxVariant& data , long &result ) { result = (long) data.Get<SetName>().to_ulong() ;} \ void ToLong##SetName( const wxxVariant& data , long &result ) { result = (long) data.wxTEMPLATED_MEMBER_CALL(Get , SetName).to_ulong() ;} \
wxEnumTypeInfo s_typeInfo##SetName(wxT_SET , &s_enumData##e , &wxToStringConverter<SetName> , &wxFromStringConverter<SetName> , &ToLong##SetName , &FromLong##SetName, typeid(SetName).name() ) ; \ wxEnumTypeInfo s_typeInfo##SetName(wxT_SET , &s_enumData##e , &wxToStringConverter<SetName> , &wxFromStringConverter<SetName> , &ToLong##SetName , &FromLong##SetName, typeid(SetName).name() ) ; \
} }
@@ -298,7 +298,7 @@ void wxFlagsToString( wxString &s , const e& data )
wxFlagsToString<e>( s , data ) ; \ wxFlagsToString<e>( s , data ) ; \
} \ } \
void FromLong##e( long data , wxxVariant& result ) { result = wxxVariant(e(data)) ;} \ void FromLong##e( long data , wxxVariant& result ) { result = wxxVariant(e(data)) ;} \
void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.Get<e>().m_data ;} \ void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.wxTEMPLATED_MEMBER_CALL(Get , e).m_data ;} \
wxEnumTypeInfo s_typeInfo##e(wxT_SET , &s_enumData##e , &wxToStringConverter<e> , &wxFromStringConverter<e> , &ToLong##e , &FromLong##e, typeid(e).name() ) ; wxEnumTypeInfo s_typeInfo##e(wxT_SET , &s_enumData##e , &wxToStringConverter<e> , &wxFromStringConverter<e> , &ToLong##e , &FromLong##e, typeid(e).name() ) ;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Type Information // Type Information
@@ -737,9 +737,9 @@ public: \
{ \ { \
Klass *obj = dynamic_cast<Klass*>(object) ; \ Klass *obj = dynamic_cast<Klass*>(object) ; \
if ( variantValue.HasData<valueType>() ) \ if ( variantValue.HasData<valueType>() ) \
obj->setterMethod(variantValue.Get<valueType>()) ; \ obj->setterMethod(variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType)) ; \
else \ else \
obj->setterMethod(*variantValue.Get<valueType*>()) ; \ obj->setterMethod(*variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType*)) ; \
} \ } \
} ; } ;
@@ -766,9 +766,9 @@ public: \
{ \ { \
Klass *obj = dynamic_cast<Klass*>(object) ; \ Klass *obj = dynamic_cast<Klass*>(object) ; \
if ( variantValue.HasData<valueType>() ) \ if ( variantValue.HasData<valueType>() ) \
obj->addermethod(variantValue.Get<valueType>()) ; \ obj->addermethod(variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType)) ; \
else \ else \
obj->addermethod(*variantValue.Get<valueType*>()) ; \ obj->addermethod(*variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType*)) ; \
} \ } \
} ; } ;
@@ -1876,7 +1876,7 @@ private :
wxObject* wxConstructorFor##name() \ wxObject* wxConstructorFor##name() \
{ return new name; } \ { return new name; } \
const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \ const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.Get<name*>() ; } \ wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data) ) ; } \ wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data) ) ; } \
wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name), \ wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name), \
(int) sizeof(name), \ (int) sizeof(name), \
@@ -1888,8 +1888,8 @@ private :
wxObject* wxConstructorFor##name() \ wxObject* wxConstructorFor##name() \
{ return new name; } \ { return new name; } \
const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \ const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return &data.Get<name>() ; } \ wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return &data.wxTEMPLATED_MEMBER_CALL(Get , name) ; } \
wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.Get<name*>() ; } \ wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data) ) ; } \ wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data) ) ; } \
wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name), \ wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name), \
(int) sizeof(name), \ (int) sizeof(name), \
@@ -1956,7 +1956,7 @@ private :
wxObject* wxConstructorFor##name() \ wxObject* wxConstructorFor##name() \
{ return new name; } \ { return new name; } \
const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,&basename2::ms_classInfo , NULL } ; \ const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,&basename2::ms_classInfo , NULL } ; \
wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.Get<name*>() ; } \ wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data) ) ; } \ wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data) ) ; } \
wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name), \ wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name), \
(int) sizeof(name), \ (int) sizeof(name), \
@@ -1984,8 +1984,8 @@ private :
#define _IMPLEMENT_ABSTRACT_CLASS(name, basename) \ #define _IMPLEMENT_ABSTRACT_CLASS(name, basename) \
const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \ const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.Get<name*>() ; } \ wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.Get<name*>() ; } \ wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data) ) ; } \ wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data) ) ; } \
wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name), \ wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name), \
(int) sizeof(name), \ (int) sizeof(name), \

4
src/common/object.cpp
View File

@@ -51,9 +51,9 @@
#if wxUSE_EXTENDED_RTTI #if wxUSE_EXTENDED_RTTI
const wxClassInfo* wxObject::ms_classParents[] = { NULL } ; const wxClassInfo* wxObject::ms_classParents[] = { NULL } ;
wxObject* wxVariantToObjectConverterwxObject ( wxxVariant &data ) wxObject* wxVariantToObjectConverterwxObject ( wxxVariant &data )
{ return data.Get<wxObject*>() ; } { return data.wxTEMPLATED_MEMBER_CALL(Get , wxObject*) ; }
wxObject* wxVariantOfPtrToObjectConverterwxObject ( wxxVariant &data ) wxObject* wxVariantOfPtrToObjectConverterwxObject ( wxxVariant &data )
{ return &data.Get<wxObject>() ; } { return &data.wxTEMPLATED_MEMBER_CALL(Get , wxObject) ; }
wxxVariant wxObjectToVariantConverterwxObject ( wxObject *data ) wxxVariant wxObjectToVariantConverterwxObject ( wxObject *data )
{ return wxxVariant( dynamic_cast<wxObject*> (data) ) ; } { return wxxVariant( dynamic_cast<wxObject*> (data) ) ; }
wxClassInfo wxObject::ms_classInfo(ms_classParents , wxT("") , wxT("wxObject"), wxClassInfo wxObject::ms_classInfo(ms_classParents , wxT("") , wxT("wxObject"),

2
src/common/xtistrm.cpp
View File

@@ -272,7 +272,7 @@ void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , c
const wxEnumTypeInfo *eti = dynamic_cast<const wxEnumTypeInfo*>( pi->GetTypeInfo() ) ; const wxEnumTypeInfo *eti = dynamic_cast<const wxEnumTypeInfo*>( pi->GetTypeInfo() ) ;
if ( eti ) if ( eti )
{ {
eti->ConvertFromLong( value.Get<long>() , value ) ; eti->ConvertFromLong( value.wxTEMPLATED_MEMBER_CALL(Get , long) , value ) ;
} }
else else
{ {