Fixed bug #1022383: 'several ComboBoxes appear selected'

[wxWidgets.git] / include / wx / xti.h

diff --git a/include/wx/xti.h b/include/wx/xti.h
index 733dec8dec227eeeccc40e2fb0c3dd4452742ed6..87da89c741919b31b12fd36b884b27a0fd3bbefd 100644 (file)
--- a/include/wx/xti.h
+++ b/include/wx/xti.h
@@ -49,37 +49,63 @@
 
 // we will move this later to defs.h
 
 
 // we will move this later to defs.h
 

-#if !wxCHECK_GCC_VERSION( 3 , 4 )
+#if defined(__GNUC__) && !wxCHECK_GCC_VERSION( 3 , 4 )

 #  define wxUSE_MEMBER_TEMPLATES 0
 #endif
 
 #  define wxUSE_MEMBER_TEMPLATES 0
 #endif
 

-#ifdef _MSC_VER
-#  if _MSC_VER <= 1200
-#    define wxUSE_MEMBER_TEMPLATES 0
-#  endif
+#if defined(_MSC_VER) && _MSC_VER <= 1200
+#  define wxUSE_MEMBER_TEMPLATES 0
+#  define wxUSE_FUNC_TEMPLATE_POINTER 0

 #endif
 
 #ifndef wxUSE_MEMBER_TEMPLATES
 #endif
 
 #ifndef wxUSE_MEMBER_TEMPLATES

-#define wxUSE_MEMBER_TEMPLATES 1
+#  define wxUSE_MEMBER_TEMPLATES 1
+#endif
+
+#ifndef wxUSE_FUNC_TEMPLATE_POINTER
+#  define wxUSE_FUNC_TEMPLATE_POINTER 1

 #endif
 
 #if wxUSE_MEMBER_TEMPLATES
 #endif
 
 #if wxUSE_MEMBER_TEMPLATES

-#define wxTEMPLATED_MEMBER_CALL( method , type ) method<type>()
-#define wxTEMPLATED_MEMBER_FIX( type )
+#  define wxTEMPLATED_MEMBER_CALL( method , type ) method<type>()
+#  define wxTEMPLATED_MEMBER_FIX( type )
+#else
+#  define wxTEMPLATED_MEMBER_CALL( method , type ) method((type*)NULL)
+#  define wxTEMPLATED_MEMBER_FIX( type ) type* =NULL
+#endif
+
+#if defined(_MSC_VER) && _MSC_VER <= 1200
+#  define wxTEMPLATED_FUNCTION_FIX( type ) , wxTEMPLATED_MEMBER_FIX(type)
+#  define wxINFUNC_CLASS_TYPE_FIX( type ) typedef type type;

 #else
 #else

-#define wxTEMPLATED_MEMBER_CALL( method , type ) method((type*)NULL)
-#define wxTEMPLATED_MEMBER_FIX( type ) type* =NULL
+#  define wxTEMPLATED_FUNCTION_FIX( type )
+#  define wxINFUNC_CLASS_TYPE_FIX( type )

 #endif
 
 #endif
 

+#define EMPTY_MACROVALUE /**/
+

 class WXDLLIMPEXP_BASE wxObject;
 class WXDLLIMPEXP_BASE wxClassInfo;
 class WXDLLIMPEXP_BASE wxDynamicClassInfo;
 class WXDLLIMPEXP_BASE wxHashTable;
 class WXDLLIMPEXP_BASE wxObjectRefData;
 class WXDLLIMPEXP_BASE wxEvent;
 class WXDLLIMPEXP_BASE wxObject;
 class WXDLLIMPEXP_BASE wxClassInfo;
 class WXDLLIMPEXP_BASE wxDynamicClassInfo;
 class WXDLLIMPEXP_BASE wxHashTable;
 class WXDLLIMPEXP_BASE wxObjectRefData;
 class WXDLLIMPEXP_BASE wxEvent;

+class WXDLLIMPEXP_BASE wxEvtHandler;

 
 typedef void (wxObject::*wxObjectEventFunction)(wxEvent&);
 
 
 typedef void (wxObject::*wxObjectEventFunction)(wxEvent&);
 

+#if wxUSE_FUNC_TEMPLATE_POINTER
+#  define wxTO_STRING(type) wxToStringConverter<type>
+#  define wxTO_STRING_IMP(type)
+#  define wxFROM_STRING(type) wxFromStringConverter<type>
+#  define wxFROM_STRING_IMP(type)
+#else
+#  define wxTO_STRING(type) ToString##type
+#  define wxTO_STRING_IMP(type) inline void ToString##type( const wxxVariant& data , wxString &result ) { wxToStringConverter<type>(data, result); }
+#  define wxFROM_STRING(type) FromString##type
+#  define wxFROM_STRING_IMP(type) inline void FromString##type( const wxString& data , wxxVariant &result ) { wxFromStringConverter<type>(data, result); }
+#endif
+

 // ----------------------------------------------------------------------------
 // Enum Support
 //
 // ----------------------------------------------------------------------------
 // Enum Support
 //


@@ -148,8 +174,10 @@ private :
     s =  s_enumData##e.GetEnumMemberName((int)data) ; \
 } \
     void FromLong##e( long data , wxxVariant& result ) { result = wxxVariant((e)data) ;} \
     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<e>() ;} \
-    wxEnumTypeInfo s_typeInfo##e(wxT_ENUM , &s_enumData##e , &wxToStringConverter<e> , &wxFromStringConverter<e> , &ToLong##e , &FromLong##e , typeid(e).name() ) ;
+    void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.wxTEMPLATED_MEMBER_CALL(Get , e) ;} \
+    wxTO_STRING_IMP( e ) \
+    wxFROM_STRING_IMP( e ) \
+    wxEnumTypeInfo s_typeInfo##e(wxT_ENUM , &s_enumData##e , &wxTO_STRING( e ) , &wxFROM_STRING( e ) , &ToLong##e , &FromLong##e , typeid(e).name() ) ;

 
 // ----------------------------------------------------------------------------
 // Set Support
 
 // ----------------------------------------------------------------------------
 // Set Support


@@ -181,7 +209,7 @@ private :
 // ----------------------------------------------------------------------------
 
 // in order to remove dependancy on string tokenizer
 // ----------------------------------------------------------------------------
 
 // in order to remove dependancy on string tokenizer

-void wxSetStringToArray( const wxString &s , wxArrayString &array ) ;
+void WXDLLIMPEXP_BASE wxSetStringToArray( const wxString &s , wxArrayString &array ) ;

 
 template<typename e>
 void wxSetFromString(const wxString &s , wxBitset<e> &data )
 
 template<typename e>
 void wxSetFromString(const wxString &s , wxBitset<e> &data )


@@ -216,7 +244,7 @@ void wxSetToString( wxString &s , const wxBitset<e> &data )
         if ( data.test( value ) )
         {
             // this could also be done by the templated calls
         if ( data.test( value ) )
         {
             // this could also be done by the templated calls

-            if ( !s.IsEmpty() )
+            if ( !s.empty() )

                 s +=wxT("|") ;
             s += edata->GetEnumMemberNameByIndex(i) ;
         }
                 s +=wxT("|") ;
             s += edata->GetEnumMemberNameByIndex(i) ;
         }


@@ -233,8 +261,10 @@ void wxSetToString( wxString &s , const wxBitset<e> &data )
     wxSetToString( s , data ) ; \
 } \
     void FromLong##SetName( long data , wxxVariant& result ) { result = wxxVariant(SetName((unsigned long)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<SetName>().to_ulong() ;} \
-    wxEnumTypeInfo s_typeInfo##SetName(wxT_SET , &s_enumData##e , &wxToStringConverter<SetName> , &wxFromStringConverter<SetName> , &ToLong##SetName , &FromLong##SetName, typeid(SetName).name() ) ;  \
+    void ToLong##SetName( const wxxVariant& data , long &result ) { result = (long) data.wxTEMPLATED_MEMBER_CALL(Get , SetName).to_ulong() ;} \
+    wxTO_STRING_IMP( SetName ) \
+    wxFROM_STRING_IMP( SetName ) \
+    wxEnumTypeInfo s_typeInfo##SetName(wxT_SET , &s_enumData##e , &wxTO_STRING( SetName ) , &wxFROM_STRING( SetName ) , &ToLong##SetName , &FromLong##SetName, typeid(SetName).name() ) ;  \

 }
 
 template<typename e>
 }
 
 template<typename e>


@@ -274,7 +304,7 @@ void wxFlagsToString( wxString &s , const e& data )
             // clear the flags we just set
             dataValue &= ~value ;
             // this could also be done by the templated calls
             // clear the flags we just set
             dataValue &= ~value ;
             // this could also be done by the templated calls

-            if ( !s.IsEmpty() )
+            if ( !s.empty() )

                 s +=wxT("|") ;
             s += edata->GetEnumMemberNameByIndex(i) ;
         }
                 s +=wxT("|") ;
             s += edata->GetEnumMemberNameByIndex(i) ;
         }


@@ -298,8 +328,10 @@ void wxFlagsToString( wxString &s , const e& data )
     wxFlagsToString<e>( s , data ) ; \
 } \
     void FromLong##e( long data , wxxVariant& result ) { result = wxxVariant(e(data)) ;} \
     wxFlagsToString<e>( 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<e>().m_data ;} \
-    wxEnumTypeInfo s_typeInfo##e(wxT_SET , &s_enumData##e , &wxToStringConverter<e> , &wxFromStringConverter<e> , &ToLong##e , &FromLong##e, typeid(e).name()  ) ;
+    void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.wxTEMPLATED_MEMBER_CALL(Get , e).m_data ;} \
+    wxTO_STRING_IMP( e ) \
+    wxFROM_STRING_IMP( e ) \
+    wxEnumTypeInfo s_typeInfo##e(wxT_SET , &s_enumData##e , &wxTO_STRING( e ) , &wxFROM_STRING( e ) , &ToLong##e , &FromLong##e, typeid(e).name()  ) ;

 // ----------------------------------------------------------------------------
 // Type Information
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Type Information
 // ----------------------------------------------------------------------------


@@ -359,8 +391,8 @@ public :
     }
 #if wxUSE_UNICODE
     wxTypeInfo(wxTypeKind kind,
     }
 #if wxUSE_UNICODE
     wxTypeInfo(wxTypeKind kind,

-               converterToString_t to = NULL, converterFromString_t from = NULL,
-               const char *name = ""):
+               converterToString_t to, converterFromString_t from,
+               const char *name):

             m_toString(to), m_fromString(from), m_kind(kind), m_name(wxString::FromAscii(name))
     {
         Register();
             m_toString(to), m_fromString(from), m_kind(kind), m_name(wxString::FromAscii(name))
     {
         Register();


@@ -502,8 +534,8 @@ public :
        wxTypeInfo( wxT_COLLECTION , to , from , name )
        { m_elementTypeName = wxString::FromAscii( elementName ) ; m_elementType = NULL ;}
 #endif
        wxTypeInfo( wxT_COLLECTION , to , from , name )
        { m_elementTypeName = wxString::FromAscii( elementName ) ; m_elementType = NULL ;}
 #endif

-       const wxTypeInfo* GetElementType() const 
-       { 
+       const wxTypeInfo* GetElementType() const
+       {

            if ( m_elementType == NULL )
                m_elementType = wxTypeInfo::FindType( m_elementTypeName ) ;
            return m_elementType ; }
            if ( m_elementType == NULL )
                m_elementType = wxTypeInfo::FindType( m_elementTypeName ) ;
            return m_elementType ; }


@@ -532,8 +564,15 @@ template<typename T> const wxTypeInfo* wxGetTypeInfo( T * ) { return wxTypeInfo:
 
 // this macro is for usage with custom, non-object derived classes and structs, wxPoint is such a custom type
 
 
 // this macro is for usage with custom, non-object derived classes and structs, wxPoint is such a custom type
 

+#if wxUSE_FUNC_TEMPLATE_POINTER

 #define wxCUSTOM_TYPE_INFO( e , toString , fromString ) \
     wxCustomTypeInfo s_typeInfo##e(typeid(e).name() , &toString , &fromString) ;
 #define wxCUSTOM_TYPE_INFO( e , toString , fromString ) \
     wxCustomTypeInfo s_typeInfo##e(typeid(e).name() , &toString , &fromString) ;

+#else
+#define wxCUSTOM_TYPE_INFO( e , toString , fromString ) \
+    void ToString##e( const wxxVariant& data , wxString &result ) { toString(data, result); } \
+    void FromString##e( const wxString& data , wxxVariant &result ) { fromString(data, result); } \
+    wxCustomTypeInfo s_typeInfo##e(typeid(e).name() , &ToString##e , &FromString##e) ;
+#endif

 
 #define wxCOLLECTION_TYPE_INFO( element , collection ) \
     wxCollectionTypeInfo s_typeInfo##collection( typeid(element).name() , NULL , NULL , typeid(collection).name() ) ;
 
 #define wxCOLLECTION_TYPE_INFO( element , collection ) \
     wxCollectionTypeInfo s_typeInfo##collection( typeid(element).name() , NULL , NULL , typeid(collection).name() ) ;


@@ -588,10 +627,10 @@ class WXDLLIMPEXP_BASE wxxVariant
 {
 public :
     wxxVariant() { m_data = NULL ; }
 {
 public :
     wxxVariant() { m_data = NULL ; }

-    wxxVariant( wxxVariantData* data , const wxString& name = wxT("") ) : m_data(data) , m_name(name) {}
+    wxxVariant( wxxVariantData* data , const wxString& name = wxEmptyString ) : m_data(data) , m_name(name) {}

     wxxVariant( const wxxVariant &d ) { if ( d.m_data ) m_data = d.m_data->Clone() ; else m_data = NULL ; m_name = d.m_name ; }
 
     wxxVariant( const wxxVariant &d ) { if ( d.m_data ) m_data = d.m_data->Clone() ; else m_data = NULL ; m_name = d.m_name ; }
 

-    template<typename T> wxxVariant( const T& data , const wxString& name = wxT("") ) :
+    template<typename T> wxxVariant( const T& data , const wxString& name = wxEmptyString ) :

     m_data(new wxxVariantDataT<T>(data) ), m_name(name) {}
 
     ~wxxVariant() { delete m_data ; }
     m_data(new wxxVariantDataT<T>(data) ), m_name(name) {}
 
     ~wxxVariant() { delete m_data ; }


@@ -600,7 +639,7 @@ public :
     template<typename T> T& Get(wxTEMPLATED_MEMBER_FIX(T))
     {
         wxxVariantDataT<T> *dataptr = dynamic_cast<wxxVariantDataT<T>*> (m_data) ;
     template<typename T> T& Get(wxTEMPLATED_MEMBER_FIX(T))
     {
         wxxVariantDataT<T> *dataptr = dynamic_cast<wxxVariantDataT<T>*> (m_data) ;

-        wxASSERT_MSG( dataptr , wxT("Cast not possible") ) ;
+        wxASSERT_MSG( dataptr , wxString::Format(wxT("Cast to %s not possible"), typeid(T).name()) ) ;

         return dataptr->Get() ;
     }
 
         return dataptr->Get() ;
     }
 


@@ -608,13 +647,13 @@ public :
     template<typename T> const T& Get(wxTEMPLATED_MEMBER_FIX(T)) const
     {
         const wxxVariantDataT<T> *dataptr = dynamic_cast<const wxxVariantDataT<T>*> (m_data) ;
     template<typename T> const T& Get(wxTEMPLATED_MEMBER_FIX(T)) const
     {
         const wxxVariantDataT<T> *dataptr = dynamic_cast<const wxxVariantDataT<T>*> (m_data) ;

-        wxASSERT_MSG( dataptr , wxT("Cast not possible") ) ;
+        wxASSERT_MSG( dataptr , wxString::Format(wxT("Cast to %s not possible"), typeid(T).name()) ) ;

         return dataptr->Get() ;
     }
 
     bool IsEmpty() const { return m_data == NULL ; }
 
         return dataptr->Get() ;
     }
 
     bool IsEmpty() const { return m_data == NULL ; }
 

-    template<typename T> bool HasData() const
+    template<typename T> bool HasData(wxTEMPLATED_MEMBER_FIX(T)) const

     {
         const wxxVariantDataT<T> *dataptr = dynamic_cast<const wxxVariantDataT<T>*> (m_data) ;
         return dataptr != NULL ;
     {
         const wxxVariantDataT<T> *dataptr = dynamic_cast<const wxxVariantDataT<T>*> (m_data) ;
         return dataptr != NULL ;


@@ -629,7 +668,8 @@ public :
 
     wxxVariant& operator=(const wxxVariant &d)
     {
 
     wxxVariant& operator=(const wxxVariant &d)
     {

-        m_data = d.m_data->Clone() ;
+        delete m_data;
+        m_data = d.m_data ? d.m_data->Clone() : NULL ;

         m_name = d.m_name ;
         return *this ;
     }
         m_name = d.m_name ;
         return *this ;
     }


@@ -666,10 +706,10 @@ template<typename T>
 void wxStringWriteValue( wxString &s , const T &data);
 
 template<typename T>
 void wxStringWriteValue( wxString &s , const T &data);
 
 template<typename T>

-void wxToStringConverter( const wxxVariant &v, wxString &s) { wxStringWriteValue( s , v.wxTEMPLATED_MEMBER_CALL(Get , T) ) ; }
+void wxToStringConverter( const wxxVariant &v, wxString &s wxTEMPLATED_FUNCTION_FIX(T)) { wxStringWriteValue( s , v.wxTEMPLATED_MEMBER_CALL(Get , T) ) ; }

 
 template<typename T>
 
 template<typename T>

-void wxFromStringConverter( const wxString &s, wxxVariant &v) { T d ; wxStringReadValue( s , d ) ; v = wxxVariant(d) ; } \
+void wxFromStringConverter( const wxString &s, wxxVariant &v wxTEMPLATED_FUNCTION_FIX(T)) { T d ; wxStringReadValue( s , d ) ; v = wxxVariant(d) ; }

 
 // ----------------------------------------------------------------------------
 // Property Support
 
 // ----------------------------------------------------------------------------
 // Property Support


@@ -712,7 +752,7 @@ private :
     wxString m_name ;
 } ;
 
     wxString m_name ;
 } ;
 

-template<typename coll_t> void wxCollectionToVariantArray( const coll_t& coll , wxxVariantArray& result ) ;
+template<typename coll_t> void WXDLLIMPEXP_BASE wxCollectionToVariantArray( const coll_t& coll , wxxVariantArray& result ) ;

 
 class WXDLLIMPEXP_BASE wxAdder
 {
 
 class WXDLLIMPEXP_BASE wxAdder
 {


@@ -726,20 +766,20 @@ private :
 } ;
 
 
 } ;
 
 

-

 #define wxSETTER( property, Klass, valueType, setterMethod ) \
 class wxSetter##property : public wxSetter \
 { \
 public: \
 #define wxSETTER( property, Klass, valueType, setterMethod ) \
 class wxSetter##property : public wxSetter \
 { \
 public: \

+    wxINFUNC_CLASS_TYPE_FIX(Klass) \

     wxSetter##property() : wxSetter( wxT(#setterMethod) ) {} \
     ~wxSetter##property() {} \
     void Set( wxObject *object, const wxxVariant &variantValue ) const \
 { \
     Klass *obj = dynamic_cast<Klass*>(object) ;  \
     wxSetter##property() : wxSetter( wxT(#setterMethod) ) {} \
     ~wxSetter##property() {} \
     void Set( wxObject *object, const wxxVariant &variantValue ) const \
 { \
     Klass *obj = dynamic_cast<Klass*>(object) ;  \

-    if ( variantValue.HasData<valueType>() ) \
-    obj->setterMethod(variantValue.Get<valueType>()) ; \
+    if ( variantValue.wxTEMPLATED_MEMBER_CALL(HasData, valueType) ) \
+    obj->setterMethod(variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType)) ; \

             else \
             else \

-            obj->setterMethod(*variantValue.Get<valueType*>()) ; \
+            obj->setterMethod(*variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType*)) ; \

 } \
 } ;
 
 } \
 } ;
 


@@ -747,6 +787,7 @@ public: \
 class wxGetter##property : public wxGetter \
 { \
 public : \
 class wxGetter##property : public wxGetter \
 { \
 public : \

+    wxINFUNC_CLASS_TYPE_FIX(Klass) \

     wxGetter##property() : wxGetter( wxT(#gettermethod) ) {} \
     ~wxGetter##property() {} \
     void Get( const wxObject *object , wxxVariant &result) const \
     wxGetter##property() : wxGetter( wxT(#gettermethod) ) {} \
     ~wxGetter##property() {} \
     void Get( const wxObject *object , wxxVariant &result) const \


@@ -760,15 +801,16 @@ public : \
 class wxAdder##property : public wxAdder \
 { \
 public: \
 class wxAdder##property : public wxAdder \
 { \
 public: \

+    wxINFUNC_CLASS_TYPE_FIX(Klass) \

     wxAdder##property() : wxAdder( wxT(#addermethod) ) {} \
     ~wxAdder##property() {} \
     void Add( wxObject *object, const wxxVariant &variantValue ) const \
 { \
     Klass *obj = dynamic_cast<Klass*>(object) ;  \
     wxAdder##property() : wxAdder( wxT(#addermethod) ) {} \
     ~wxAdder##property() {} \
     void Add( wxObject *object, const wxxVariant &variantValue ) const \
 { \
     Klass *obj = dynamic_cast<Klass*>(object) ;  \

-    if ( variantValue.HasData<valueType>() ) \
-    obj->addermethod(variantValue.Get<valueType>()) ; \
+    if ( variantValue.wxTEMPLATED_MEMBER_CALL(HasData, valueType) ) \
+    obj->addermethod(variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType)) ; \

             else \
             else \

-            obj->addermethod(*variantValue.Get<valueType*>()) ; \
+            obj->addermethod(*variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType*)) ; \

 } \
 } ;
 
 } \
 } ;
 


@@ -776,6 +818,7 @@ public: \
 class wxCollectionGetter##property : public wxCollectionGetter \
 { \
 public : \
 class wxCollectionGetter##property : public wxCollectionGetter \
 { \
 public : \

+    wxINFUNC_CLASS_TYPE_FIX(Klass) \

     wxCollectionGetter##property() : wxCollectionGetter( wxT(#gettermethod) ) {} \
     ~wxCollectionGetter##property() {} \
     void Get( const wxObject *object , wxxVariantArray &result) const \
     wxCollectionGetter##property() : wxCollectionGetter( wxT(#gettermethod) ) {} \
     ~wxCollectionGetter##property() {} \
     void Get( const wxObject *object , wxxVariantArray &result) const \


@@ -836,7 +879,8 @@ public :
     wxGenericPropertyAccessor( const wxString &propName ) ;
     ~wxGenericPropertyAccessor() ;
 
     wxGenericPropertyAccessor( const wxString &propName ) ;
     ~wxGenericPropertyAccessor() ;
 

-    void RenameProperty( const wxString &oldName , const wxString &newName )
+    void RenameProperty( const wxString& WXUNUSED_UNLESS_DEBUG(oldName),
+        const wxString& newName )

     {
         wxASSERT( oldName == m_propertyName ) ; m_propertyName = newName ;
     }
     {
         wxASSERT( oldName == m_propertyName ) ; m_propertyName = newName ;
     }


@@ -1001,13 +1045,13 @@ public :
        ~wxPropertyInfo() ;
 
        // return the class this property is declared in
        ~wxPropertyInfo() ;
 
        // return the class this property is declared in

-       const wxClassInfo*   GetDeclaringClass() const { return m_itsClass ; }
+       const wxClassInfo*  GetDeclaringClass() const { return m_itsClass ; }

 
        // return the name of this property
 
        // return the name of this property

-       const wxString&         GetName() const { return m_name ; }
+       const wxString&     GetName() const { return m_name ; }

 
        // returns the flags of this property
 
        // returns the flags of this property

-       wxPropertyInfoFlags  GetFlags() const { return m_flags ;}
+       wxPropertyInfoFlags GetFlags() const { return m_flags ;}

 
        // returns the short help string of this property
        const wxString&     GetHelpString() const { return m_helpString ; }
 
        // returns the short help string of this property
        const wxString&     GetHelpString() const { return m_helpString ; }


@@ -1016,7 +1060,7 @@ public :
        const wxString&     GetGroupString() const { return m_groupString ; }
 
        // return the element type info of this property (for collections, otherwise NULL)
        const wxString&     GetGroupString() const { return m_groupString ; }
 
        // return the element type info of this property (for collections, otherwise NULL)

-       const wxTypeInfo *      GetCollectionElementTypeInfo() const
+       const wxTypeInfo *  GetCollectionElementTypeInfo() const

        {
            if ( m_collectionElementTypeInfo == NULL )
                m_collectionElementTypeInfo = wxTypeInfo::FindType(m_collectionElementTypeName) ;
        {
            if ( m_collectionElementTypeInfo == NULL )
                m_collectionElementTypeInfo = wxTypeInfo::FindType(m_collectionElementTypeName) ;


@@ -1024,7 +1068,7 @@ public :
        }
 
        // return the type info of this property
        }
 
        // return the type info of this property

-       const wxTypeInfo *      GetTypeInfo() const
+       const wxTypeInfo *  GetTypeInfo() const

        {
            if ( m_typeInfo == NULL )
                m_typeInfo = wxTypeInfo::FindType(m_typeName) ;
        {
            if ( m_typeInfo == NULL )
                m_typeInfo = wxTypeInfo::FindType(m_typeName) ;


@@ -1038,7 +1082,7 @@ public :
        wxPropertyInfo*     GetNext() const { return m_next ; }
 
        // returns the default value of this property, its kind may be wxT_VOID if it is not valid
        wxPropertyInfo*     GetNext() const { return m_next ; }
 
        // returns the default value of this property, its kind may be wxT_VOID if it is not valid

-       wxxVariant                      GetDefaultValue() const { return m_defaultValue ; }
+       wxxVariant          GetDefaultValue() const { return m_defaultValue ; }

 private :
     void Insert(wxPropertyInfo* &iter)
     {
 private :
     void Insert(wxPropertyInfo* &iter)
     {


@@ -1062,7 +1106,7 @@ private :
     mutable wxTypeInfo*         m_collectionElementTypeInfo ;
     wxString            m_collectionElementTypeName ;
     wxPropertyAccessor* m_accessor ;
     mutable wxTypeInfo*         m_collectionElementTypeInfo ;
     wxString            m_collectionElementTypeName ;
     wxPropertyAccessor* m_accessor ;

-    wxxVariant                 m_defaultValue;
+    wxxVariant          m_defaultValue;

     wxPropertyInfoFlags m_flags ;
     wxString            m_helpString ;
     wxString            m_groupString ;
     wxPropertyInfoFlags m_flags ;
     wxString            m_helpString ;
     wxString            m_groupString ;


@@ -1086,7 +1130,7 @@ WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxPropertyInfo* , wxPropertyInfoMap , clas
 #define wxHIDE_PROPERTY( pname ) \
     static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(void).name() ,NULL , wxxVariant() , wxPROP_DONT_STREAM , wxEmptyString , wxEmptyString ) ;
 
 #define wxHIDE_PROPERTY( pname ) \
     static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(void).name() ,NULL , wxxVariant() , wxPROP_DONT_STREAM , wxEmptyString , wxEmptyString ) ;
 

-#define wxPROPERTY( pname , type , setter , getter ,defaultValue , flags , help , group) \
+#define wxPROPERTY( pname , type , setter , getter , defaultValue , flags , help , group) \

     wxSETTER( pname , class_t , type , setter ) \
     static wxSetter##pname _setter##pname ; \
     wxGETTER( pname , class_t , type , getter ) \
     wxSETTER( pname , class_t , type , setter ) \
     static wxSetter##pname _setter##pname ; \
     wxGETTER( pname , class_t , type , getter ) \


@@ -1184,13 +1228,13 @@ public :
        ~wxHandlerInfo() ;
 
        // return the name of this handler
        ~wxHandlerInfo() ;
 
        // return the name of this handler

-       const wxString&         GetName() const { return m_name ; }
+       const wxString& GetName() const { return m_name ; }

 
        // return the class info of the event
 
        // return the class info of the event

-       const wxClassInfo *     GetEventClassInfo() const { return m_eventClassInfo ; }
+       const wxClassInfo *GetEventClassInfo() const { return m_eventClassInfo ; }

 
        // get the handler function pointer
 
        // get the handler function pointer

-       wxObjectEventFunction   GetEventFunction() const { return m_eventFunction ; }
+       wxObjectEventFunction GetEventFunction() const { return m_eventFunction ; }

 
        // returns NULL if this is the last handler of this class
        wxHandlerInfo*     GetNext() const { return m_next ; }
 
        // returns NULL if this is the last handler of this class
        wxHandlerInfo*     GetNext() const { return m_next ; }


@@ -1656,13 +1700,13 @@ public:
     // gets the streaming callback from this class or any superclass
     wxObjectStreamingCallback GetStreamingCallback() const ;
 
     // 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.
     // 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.
     // Cleans up hash table used for fast searching.

-    wxDEPRECATED( static void     CleanUpClasses() );
+    wxDEPRECATED( static void CleanUpClasses() );

 #endif
 #endif

-    static void     CleanUp();
+    static void CleanUp();

 
     // returns the first property
     const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; }
 
     // returns the first property
     const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; }


@@ -1698,10 +1742,11 @@ public:
 
     // we must be able to cast variants to wxObject pointers, templates seem not to be suitable
     wxObject* VariantToInstance( wxxVariant &data ) const
 
     // we must be able to cast variants to wxObject pointers, templates seem not to be suitable
     wxObject* VariantToInstance( wxxVariant &data ) const

-    {  if ( data.GetTypeInfo()->GetKind() == wxT_OBJECT )
-    return m_variantToObjectConverter( data ) ;
-    else
-        return m_variantOfPtrToObjectConverter( data ) ;
+    {
+        if ( data.GetTypeInfo()->GetKind() == wxT_OBJECT )
+            return m_variantToObjectConverter( data ) ;
+        else
+            return m_variantOfPtrToObjectConverter( data ) ;

     }
 
     wxxVariant InstanceToVariant( wxObject *object ) const { return m_objectToVariantConverter( object ) ; }
     }
 
     wxxVariant InstanceToVariant( wxObject *object ) const { return m_objectToVariantConverter( object ) ; }


@@ -1737,15 +1782,15 @@ public:
     static wxHashTable      *sm_classTable;
 
 protected :
     static wxHashTable      *sm_classTable;
 
 protected :

-    wxPropertyInfo *       m_firstProperty ;
-    wxHandlerInfo *            m_firstHandler ;
+    wxPropertyInfo *         m_firstProperty ;
+    wxHandlerInfo *          m_firstHandler ;

 private:
 private:

-    const wxClassInfo**                m_parents ;
-    const wxChar*                      m_unitName;
+    const wxClassInfo**      m_parents ;
+    const wxChar*            m_unitName;

 
 

-    wxConstructorBridge*       m_constructor ;
-    const wxChar **                    m_constructorProperties ;
-    const int                          m_constructorPropertiesCount ;
+    wxConstructorBridge*     m_constructor ;
+    const wxChar **          m_constructorProperties ;
+    const int                m_constructorPropertiesCount ;

     wxVariantToObjectConverter m_variantOfPtrToObjectConverter ;
     wxVariantToObjectConverter m_variantToObjectConverter ;
     wxObjectToVariantConverter m_objectToVariantConverter ;
     wxVariantToObjectConverter m_variantOfPtrToObjectConverter ;
     wxVariantToObjectConverter m_variantToObjectConverter ;
     wxObjectToVariantConverter m_objectToVariantConverter ;


@@ -1876,7 +1921,7 @@ private :
     wxObject* wxConstructorFor##name()                             \
 { return new name; }                                          \
     const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
     wxObject* wxConstructorFor##name()                             \
 { return new name; }                                          \
     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)  ) ; } \
     wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name),   \
     (int) sizeof(name),                              \
     wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
     wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name),   \
     (int) sizeof(name),                              \


@@ -1888,8 +1933,8 @@ private :
     wxObject* wxConstructorFor##name()                             \
 { return new name; }                                          \
     const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
     wxObject* wxConstructorFor##name()                             \
 { return new name; }                                          \
     const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \

-    wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return &data.Get<name>() ; } \
-    wxObject* wxVariantOfPtrToObjectConverter##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.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \

     wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
     wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name),   \
     (int) sizeof(name),                              \
     wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
     wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name),   \
     (int) sizeof(name),                              \


@@ -1931,7 +1976,7 @@ private :
 
 #define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_NO_BASE_XTI( name , unit ) \
     const wxClassInfo* name::ms_classParents[] = { NULL } ; \
 
 #define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_NO_BASE_XTI( name , unit ) \
     const wxClassInfo* name::ms_classParents[] = { NULL } ; \

-    wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name),   \
+    wxClassInfo name::ms_classInfo(name::ms_classParents , wxEmptyString , wxT(#name),   \

     (int) sizeof(name),                              \
     (wxObjectConstructorFn) 0   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
     (int) sizeof(name),                              \
     (wxObjectConstructorFn) 0   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \


@@ -1942,7 +1987,7 @@ private :
 
 #define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_XTI( name , basename, unit ) \
     const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
 
 #define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_XTI( name , basename, unit ) \
     const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \

-    wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name),   \
+    wxClassInfo name::ms_classInfo(name::ms_classParents , wxEmptyString , wxT(#name),   \

     (int) sizeof(name),                              \
     (wxObjectConstructorFn) 0   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
     (int) sizeof(name),                              \
     (wxObjectConstructorFn) 0   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \


@@ -1956,7 +2001,7 @@ private :
     wxObject* wxConstructorFor##name()                             \
 { return new name; }                                          \
     const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,&basename2::ms_classInfo , NULL } ; \
     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<name*>() ; } \
+    wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \

     wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
     wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name),   \
     (int) sizeof(name),                              \
     wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
     wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name),   \
     (int) sizeof(name),                              \


@@ -1984,10 +2029,10 @@ private :
 
 #define _IMPLEMENT_ABSTRACT_CLASS(name, basename)                \
     const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
 
 #define _IMPLEMENT_ABSTRACT_CLASS(name, basename)                \
     const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \

-    wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.Get<name*>() ; } \
-    wxObject* wxVariantOfPtrToObjectConverter##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.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 , wxEmptyString , wxT(#name),   \

     (int) sizeof(name),                              \
     (wxObjectConstructorFn) 0   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
     (int) sizeof(name),                              \
     (wxObjectConstructorFn) 0   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \