X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bb7eff4c0d743ccd1ef97022370536f52610671a..0c089c08261235630426ccedb29d7049f1cef1bd:/include/wx/xti.h diff --git a/include/wx/xti.h b/include/wx/xti.h index 733dec8dec..72484ba5c4 100644 --- a/include/wx/xti.h +++ b/include/wx/xti.h @@ -148,7 +148,7 @@ private : s = s_enumData##e.GetEnumMemberName((int)data) ; \ } \ void FromLong##e( long data , wxxVariant& result ) { result = wxxVariant((e)data) ;} \ - void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.Get() ;} \ + 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 , &wxFromStringConverter , &ToLong##e , &FromLong##e , typeid(e).name() ) ; // ---------------------------------------------------------------------------- @@ -233,7 +233,7 @@ void wxSetToString( wxString &s , const wxBitset &data ) wxSetToString( s , 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().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 , &wxFromStringConverter , &ToLong##SetName , &FromLong##SetName, typeid(SetName).name() ) ; \ } @@ -298,7 +298,7 @@ void wxFlagsToString( wxString &s , const e& data ) wxFlagsToString( s , data ) ; \ } \ void FromLong##e( long data , wxxVariant& result ) { result = wxxVariant(e(data)) ;} \ - void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.Get().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 , &wxFromStringConverter , &ToLong##e , &FromLong##e, typeid(e).name() ) ; // ---------------------------------------------------------------------------- // Type Information @@ -737,9 +737,9 @@ public: \ { \ Klass *obj = dynamic_cast(object) ; \ if ( variantValue.HasData() ) \ - obj->setterMethod(variantValue.Get()) ; \ + obj->setterMethod(variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType)) ; \ else \ - obj->setterMethod(*variantValue.Get()) ; \ + obj->setterMethod(*variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType*)) ; \ } \ } ; @@ -766,9 +766,9 @@ public: \ { \ Klass *obj = dynamic_cast(object) ; \ if ( variantValue.HasData() ) \ - obj->addermethod(variantValue.Get()) ; \ + obj->addermethod(variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType)) ; \ else \ - obj->addermethod(*variantValue.Get()) ; \ + obj->addermethod(*variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType*)) ; \ } \ } ; @@ -1656,13 +1656,13 @@ public: // gets the streaming callback from this class or any superclass wxObjectStreamingCallback GetStreamingCallback() const ; -#ifdef WXWIN_COMPATIBILITY_2_4 +#if WXWIN_COMPATIBILITY_2_4 // Initializes parent pointers and hash table for fast searching. - wxDEPRECATED( static void InitializeClasses() ); + wxDEPRECATED( static void InitializeClasses() ); // Cleans up hash table used for fast searching. - wxDEPRECATED( static void CleanUpClasses() ); + wxDEPRECATED( static void CleanUpClasses() ); #endif - static void CleanUp(); + static void CleanUp(); // returns the first property const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; } @@ -1876,7 +1876,7 @@ private : wxObject* wxConstructorFor##name() \ { return new name; } \ const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \ - wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.Get() ; } \ + wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \ wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast (data) ) ; } \ wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name), \ (int) sizeof(name), \ @@ -1888,8 +1888,8 @@ private : wxObject* wxConstructorFor##name() \ { return new name; } \ const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \ - wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return &data.Get() ; } \ - wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.Get() ; } \ + wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return &data.wxTEMPLATED_MEMBER_CALL(Get , name) ; } \ + wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \ wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast (data) ) ; } \ wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name), \ (int) sizeof(name), \ @@ -1956,7 +1956,7 @@ private : wxObject* wxConstructorFor##name() \ { return new name; } \ const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,&basename2::ms_classInfo , NULL } ; \ - wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.Get() ; } \ + wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \ wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast (data) ) ; } \ wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name), \ (int) sizeof(name), \ @@ -1984,8 +1984,8 @@ private : #define _IMPLEMENT_ABSTRACT_CLASS(name, basename) \ const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \ - wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.Get() ; } \ - wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.Get() ; } \ + wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \ + wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \ wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast (data) ) ; } \ wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name), \ (int) sizeof(name), \