multilib mode

[wxWidgets.git] / src / common / xti.cpp

diff --git a/src/common/xti.cpp b/src/common/xti.cpp
index 13595aa27caa84fcf4707b4080d68226df69a9b1..52eb0a771527526bdef624cc1526b2b44ca623ff 100644 (file)
--- a/src/common/xti.cpp
+++ b/src/common/xti.cpp
@@ -2,7 +2,7 @@
 // Name:        src/common/xti.cpp
 // Purpose:     runtime metadata information (extended class info
 // Author:      Stefan Csomor
 // Name:        src/common/xti.cpp
 // Purpose:     runtime metadata information (extended class info
 // Author:      Stefan Csomor

-// Modified by: 
+// Modified by:

 // Created:     27/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Julian Smart
 // Created:     27/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Julian Smart


@@ -31,15 +31,15 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-#if wxUSE_XTI
+#if wxUSE_EXTENDED_RTTI

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

-wxEnumData::wxEnumData( wxEnumMemberData* data ) 
+wxEnumData::wxEnumData( wxEnumMemberData* data )

 {
 {

-       m_members = data ; 
+       m_members = data ;

     for ( m_count = 0; m_members[m_count].m_name ; m_count++)
                {} ;
 }
     for ( m_count = 0; m_members[m_count].m_name ; m_count++)
                {} ;
 }


@@ -69,7 +69,7 @@ int wxEnumData::GetEnumMemberValue(const wxChar *name)
                        return m_members[i].m_value;
                }
        }
                        return m_members[i].m_value;
                }
        }

-       return 0 ;
+    return 0 ;

 }
 
 const wxChar *wxEnumData::GetEnumMemberName(int value)
 }
 
 const wxChar *wxEnumData::GetEnumMemberName(int value)


@@ -82,13 +82,13 @@ const wxChar *wxEnumData::GetEnumMemberName(int value)
        return wxT("") ;
 }
 
        return wxT("") ;
 }
 

-int wxEnumData::GetEnumMemberValueByIndex( int idx ) 
+int wxEnumData::GetEnumMemberValueByIndex( int idx )

 {
        // we should cache the count in order to avoid out-of-bounds errors
        return m_members[idx].m_value ;
 }
 
 {
        // we should cache the count in order to avoid out-of-bounds errors
        return m_members[idx].m_value ;
 }
 

-const char * wxEnumData::GetEnumMemberNameByIndex( int idx ) 
+const char * wxEnumData::GetEnumMemberNameByIndex( int idx )

 {
        // we should cache the count in order to avoid out-of-bounds errors
        return m_members[idx].m_name ;
 {
        // we should cache the count in order to avoid out-of-bounds errors
        return m_members[idx].m_name ;


@@ -98,107 +98,143 @@ const char * wxEnumData::GetEnumMemberNameByIndex( int idx )
 // Type Information
 // ----------------------------------------------------------------------------
 
 // Type Information
 // ----------------------------------------------------------------------------
 

-const wxTypeInfo* wxGetTypeInfo( void * )
+template<> const wxTypeInfo* wxGetTypeInfo( void * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_VOID ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_VOID ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( bool * )
+template<> const wxTypeInfo* wxGetTypeInfo( bool * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_BOOL ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_BOOL ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( char * )
+template<> const wxTypeInfo* wxGetTypeInfo( char * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_CHAR ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_CHAR ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( unsigned char * )
+template<> const wxTypeInfo* wxGetTypeInfo( unsigned char * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_UCHAR ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_UCHAR ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( int * )
+template<> const wxTypeInfo* wxGetTypeInfo( int * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_CHAR ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_CHAR ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( unsigned int * )
+template<> const wxTypeInfo* wxGetTypeInfo( unsigned int * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_UCHAR ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_UCHAR ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( long * )
+template<> const wxTypeInfo* wxGetTypeInfo( long * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_CHAR ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_CHAR ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( unsigned long * )
+template<> const wxTypeInfo* wxGetTypeInfo( unsigned long * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_UCHAR ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_UCHAR ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( float * )
+template<> const wxTypeInfo* wxGetTypeInfo( float * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_FLOAT ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_FLOAT ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( double * )
+template<> const wxTypeInfo* wxGetTypeInfo( double * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_DOUBLE ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_DOUBLE ) ;
        return &s_typeInfo ;
 }
 

-const wxTypeInfo* wxGetTypeInfo( wxString * )
+template<> const wxTypeInfo* wxGetTypeInfo( wxString * )

 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_STRING ) ;
        return &s_typeInfo ;
 }
 
 {
        static wxBuiltInTypeInfo s_typeInfo( wxT_STRING ) ;
        return &s_typeInfo ;
 }
 

-// this is a compiler induced specialization which is never used anywhere
-// const char * should never be active
+// this are compiler induced specialization which are never used anywhere

 
 

-const wxTypeInfo* wxGetTypeInfo( char const ** )
+// char const *
+
+template<> const wxTypeInfo* wxGetTypeInfo( char const ** )

 {
        assert(0) ;
        static wxBuiltInTypeInfo s_typeInfo( wxT_VOID ) ;
        return &s_typeInfo ;
 }
 
 {
        assert(0) ;
        static wxBuiltInTypeInfo s_typeInfo( wxT_VOID ) ;
        return &s_typeInfo ;
 }
 

-void wxStringReadValue(const wxString & , const char* & )
+template<> void wxStringReadValue(const wxString & , const char* & )

 {
        assert(0) ;
 }
 
 {
        assert(0) ;
 }
 

-void wxStringWriteValue(wxString & , char const * const & )
+template<> void wxStringWriteValue(wxString & , char const * const & )

 {
        assert(0) ;
 }
 
 {
        assert(0) ;
 }
 

+// char *
+
+template<> const wxTypeInfo* wxGetTypeInfo( char ** )
+{
+        assert(0) ;
+        static wxBuiltInTypeInfo s_typeInfo( wxT_VOID ) ;
+        return &s_typeInfo ;
+}
+
+template<> void wxStringReadValue(const wxString & , char* & )
+{
+        assert(0) ;
+}
+
+template<> void wxStringWriteValue(wxString & , char * const & )
+{
+        assert(0) ;
+}
+
+// const wxPoint
+/*
+template<> const wxTypeInfo* wxGetTypeInfo( const wxPoint * )
+{
+        assert(0) ;
+        static wxBuiltInTypeInfo s_typeInfo( wxT_VOID ) ;
+        return &s_typeInfo ;
+}

 
 

+template<> void wxStringReadValue(const wxString & , const wxPoint & )
+{
+        assert(0) ;
+}
+*/

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// value streaming 
+// value streaming

 // ----------------------------------------------------------------------------
 
 // convenience function (avoids including xml headers in users code)
 
 // ----------------------------------------------------------------------------
 
 // convenience function (avoids including xml headers in users code)
 

-void wxXmlAddContentToNode( wxXmlNode* node , const wxString& data ) 
+void wxXmlAddContentToNode( wxXmlNode* node , const wxString& data )

 {
 {

-       node->AddChild(new wxXmlNode(wxXML_TEXT_NODE, "value", data ) ); 
+       node->AddChild(new wxXmlNode(wxXML_TEXT_NODE, "value", data ) );

 }
 
 }
 

-wxString wxXmlGetContentFromNode( wxXmlNode *node ) 
+wxString wxXmlGetContentFromNode( wxXmlNode *node )

 {
 {

-       return node->GetChildren()->GetContent() ;
+       if ( node->GetChildren() )
+               return node->GetChildren()->GetContent() ;
+       else
+               return wxEmptyString ;

 }
 
 // streamer specializations
 }
 
 // streamer specializations


@@ -207,36 +243,36 @@ wxString wxXmlGetContentFromNode( wxXmlNode *node )
 
 // long
 
 
 // long
 

-void wxStringReadValue(const wxString &s , long &data )
+template<> void wxStringReadValue(const wxString &s , long &data )

 {
        wxSscanf(s, _T("%ld"), &data ) ;
 }
 
 {
        wxSscanf(s, _T("%ld"), &data ) ;
 }
 

-void wxStringWriteValue(wxString &s , const long &data )
+template<> void wxStringWriteValue(wxString &s , const long &data )

 {
        s = wxString::Format("%ld", data ) ;
 }
 
 {
        s = wxString::Format("%ld", data ) ;
 }
 

-// long
+// int

 
 

-void wxStringReadValue(const wxString &s , int &data )
+template<> void wxStringReadValue(const wxString &s , int &data )

 {
        wxSscanf(s, _T("%d"), &data ) ;
 }
 
 {
        wxSscanf(s, _T("%d"), &data ) ;
 }
 

-void wxStringWriteValue(wxString &s , const int &data )
+template<> void wxStringWriteValue(wxString &s , const int &data )

 {
        s = wxString::Format("%d", data ) ;
 }
 
 // wxString
 
 {
        s = wxString::Format("%d", data ) ;
 }
 
 // wxString
 

-void wxStringReadValue(const wxString &s , wxString &data )
+template<> void wxStringReadValue(const wxString &s , wxString &data )

 {
        data = s ;
 }
 
 {
        data = s ;
 }
 

-void wxStringWriteValue(wxString &s , const wxString &data )
+template<> void wxStringWriteValue(wxString &s , const wxString &data )

 {
        s = data ;
 }
 {
        s = data ;
 }


@@ -249,21 +285,33 @@ void wxStringWriteValue(wxString &s , const wxString &data )
 
 // wxPoint
 
 
 // wxPoint
 

-void wxStringReadValue(const wxString &s , wxPoint &data )
+template<> void wxStringReadValue(const wxString &s , wxPoint &data )

 {
        wxSscanf(s, _T("%d,%d"), &data.x , &data.y ) ;
 }
 
 {
        wxSscanf(s, _T("%d,%d"), &data.x , &data.y ) ;
 }
 

-void wxStringWriteValue(wxString &s , const wxPoint &data )
+template<> void wxStringWriteValue(wxString &s , const wxPoint &data )

 {
        s = wxString::Format("%d,%d", data.x , data.y ) ;
 }
 
 WX_CUSTOM_TYPE_INFO(wxPoint)
 
 {
        s = wxString::Format("%d,%d", data.x , data.y ) ;
 }
 
 WX_CUSTOM_TYPE_INFO(wxPoint)
 

+template<> void wxStringReadValue(const wxString &s , wxSize &data )
+{
+       wxSscanf(s, _T("%d,%d"), &data.x , &data.y ) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const wxSize &data )
+{
+       s = wxString::Format("%d,%d", data.x , data.y ) ;
+}
+
+WX_CUSTOM_TYPE_INFO(wxSize)
+

 // removing header dependancy on string tokenizer
 
 // removing header dependancy on string tokenizer
 

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

 {
     wxStringTokenizer tokenizer(s, wxT("| \t\n"), wxTOKEN_STRTOK);
     wxString flag;
 {
     wxStringTokenizer tokenizer(s, wxT("| \t\n"), wxTOKEN_STRTOK);
     wxString flag;


@@ -275,7 +323,7 @@ void wxSetStringToArray( const wxString &s , wxArrayString &array )
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// wxClassInfo 
+// wxClassInfo

 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 
 


@@ -298,15 +346,15 @@ void wxClassInfo::Unregister(const char *WXUNUSED(name))
 
 const wxPropertyAccessor *wxClassInfo::FindAccessor(const char *PropertyName)
 {
 
 const wxPropertyAccessor *wxClassInfo::FindAccessor(const char *PropertyName)
 {

-    const wxPropertyInfo* info = FindPropInfo( PropertyName ) ;
-       
+    const wxPropertyInfo* info = FindPropertyInfo( PropertyName ) ;
+

        if ( info )
                return info->GetAccessor() ;
 
        return NULL ;
 }
 
        if ( info )
                return info->GetAccessor() ;
 
        return NULL ;
 }
 

-const wxPropertyInfo *wxClassInfo::FindPropInfo (const char *PropertyName) const
+const wxPropertyInfo *wxClassInfo::FindPropertyInfo (const char *PropertyName) const

 {
        const wxPropertyInfo* info = GetFirstProperty() ;
 
 {
        const wxPropertyInfo* info = GetFirstProperty() ;
 


@@ -320,13 +368,35 @@ const wxPropertyInfo *wxClassInfo::FindPropInfo (const char *PropertyName) const
        const wxClassInfo** parents = GetParents() ;
        for ( int i = 0 ; parents[i] ; ++ i )
        {
        const wxClassInfo** parents = GetParents() ;
        for ( int i = 0 ; parents[i] ; ++ i )
        {

-               if ( ( info = parents[i]->FindPropInfo( PropertyName ) ) != NULL )
+               if ( ( info = parents[i]->FindPropertyInfo( PropertyName ) ) != NULL )
+                       return info ;
+       }
+
+    return 0;
+}
+
+const wxHandlerInfo *wxClassInfo::FindHandlerInfo (const char *PropertyName) const
+{
+       const wxHandlerInfo* info = GetFirstHandler() ;
+
+       while( info )
+       {
+               if ( strcmp( info->GetName() , PropertyName ) == 0 )
+                       return info ;
+               info = info->GetNext() ;
+       }
+
+       const wxClassInfo** parents = GetParents() ;
+       for ( int i = 0 ; parents[i] ; ++ i )
+       {
+               if ( ( info = parents[i]->FindHandlerInfo( PropertyName ) ) != NULL )

                        return info ;
        }
 
     return 0;
 }
 
                        return info ;
        }
 
     return 0;
 }
 

+

 void wxClassInfo::SetProperty(wxObject *object, const char *propertyName, const wxxVariant &value)
 {
     const wxPropertyAccessor *accessor;
 void wxClassInfo::SetProperty(wxObject *object, const char *propertyName, const wxxVariant &value)
 {
     const wxPropertyAccessor *accessor;