added accessor function to hide __VISAGECPP__ ugliness and avoid having #ifdef's...

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

diff --git a/include/wx/xti.h b/include/wx/xti.h
index 7c3cf5552e85c75c6fc2d3a8955556a2f2c6609c..2eb3e35e22585cd1a71464f0697dbbe3c1d58ee1 100644 (file)
--- a/include/wx/xti.h
+++ b/include/wx/xti.h
@@ -90,11 +90,12 @@ 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 (wxEvtHandler::*wxObjectEventFunction)(wxEvent&);
 
 #if wxUSE_FUNC_TEMPLATE_POINTER
-#  define wxTO_STRING(type) wxToStringConverter<type>  
+#  define wxTO_STRING(type) wxToStringConverter<type>
 #  define wxTO_STRING_IMP(type)
 #  define wxFROM_STRING(type) wxFromStringConverter<type>
 #  define wxFROM_STRING_IMP(type)
@@ -208,7 +209,7 @@ private :
 // ----------------------------------------------------------------------------
 
 // 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 )
@@ -243,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 ( !s.IsEmpty() )
+            if ( !s.empty() )
                 s +=wxT("|") ;
             s += edata->GetEnumMemberNameByIndex(i) ;
         }
@@ -303,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
-            if ( !s.IsEmpty() )
+            if ( !s.empty() )
                 s +=wxT("|") ;
             s += edata->GetEnumMemberNameByIndex(i) ;
         }
@@ -390,8 +391,8 @@ public :
     }
 #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();
@@ -533,8 +534,8 @@ public :
        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 ; }
@@ -626,10 +627,10 @@ class WXDLLIMPEXP_BASE wxxVariant
 {
 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 ; }
 
-    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 ; }
@@ -667,7 +668,8 @@ public :
 
     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 ;
     }
@@ -707,7 +709,7 @@ template<typename T>
 void wxToStringConverter( const wxxVariant &v, wxString &s wxTEMPLATED_FUNCTION_FIX(T)) { wxStringWriteValue( s , v.wxTEMPLATED_MEMBER_CALL(Get , T) ) ; }
 
 template<typename T>
-void wxFromStringConverter( const wxString &s, wxxVariant &v wxTEMPLATED_FUNCTION_FIX(T)) { 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
@@ -750,7 +752,7 @@ private :
     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
 {
@@ -877,7 +879,8 @@ public :
     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 ;
     }
@@ -1042,13 +1045,13 @@ public :
        ~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
-       const wxString&         GetName() const { return m_name ; }
+       const wxString&     GetName() const { return m_name ; }
 
        // 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 ; }
@@ -1057,7 +1060,7 @@ public :
        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) ;
@@ -1065,7 +1068,7 @@ public :
        }
 
        // 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) ;
@@ -1079,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
-       wxxVariant                      GetDefaultValue() const { return m_defaultValue ; }
+       wxxVariant          GetDefaultValue() const { return m_defaultValue ; }
 private :
     void Insert(wxPropertyInfo* &iter)
     {
@@ -1103,7 +1106,7 @@ private :
     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 ;
@@ -1225,13 +1228,13 @@ public :
        ~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
-       const wxClassInfo *     GetEventClassInfo() const { return m_eventClassInfo ; }
+       const wxClassInfo *GetEventClassInfo() const { return m_eventClassInfo ; }
 
        // 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 ; }
@@ -1739,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
-    {  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 ) ; }
@@ -1778,15 +1782,15 @@ public:
     static wxHashTable      *sm_classTable;
 
 protected :
-    wxPropertyInfo *       m_firstProperty ;
-    wxHandlerInfo *            m_firstHandler ;
+    wxPropertyInfo *         m_firstProperty ;
+    wxHandlerInfo *          m_firstHandler ;
 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 ;
@@ -1972,7 +1976,7 @@ private :
 
 #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 ,     \
@@ -1983,7 +1987,7 @@ private :
 
 #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 ,     \
@@ -2028,7 +2032,7 @@ private :
     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("") , wxT(#name),   \
+    wxClassInfo name::ms_classInfo(name::ms_classParents , wxEmptyString , wxT(#name),   \
     (int) sizeof(name),                              \
     (wxObjectConstructorFn) 0   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \