X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30bfc425744ec3b797a956a9b78b902ff248bf3b..04857cb707be4de8083e599fc2e1967c77eb7f5e:/src/common/xti.cpp

diff --git a/src/common/xti.cpp b/src/common/xti.cpp
index 74db154c92..992dc46bef 100644
--- 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
-// Modified by: 
+// Modified by:
 // Created:     27/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Julian Smart
@@ -10,7 +10,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "xti.h"
 #endif
 
@@ -37,9 +37,9 @@
 // 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++)
 		{} ;
 }
@@ -69,7 +69,7 @@ int wxEnumData::GetEnumMemberValue(const wxChar *name)
 			return m_members[i].m_value;
 		}
 	}
-	return 0 ;
+    return 0 ;
 }
 
 const wxChar *wxEnumData::GetEnumMemberName(int value)
@@ -82,13 +82,13 @@ const wxChar *wxEnumData::GetEnumMemberName(int value)
 	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 ;
 }
 
-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 ;
@@ -98,145 +98,211 @@ const char * wxEnumData::GetEnumMemberNameByIndex( int idx )
 // Type Information
 // ----------------------------------------------------------------------------
 
-const wxTypeInfo* wxGetTypeInfo( void * )
+template<> const wxTypeInfo* wxGetTypeInfo( void * )
 {
 	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 ;
 }
 
-const wxTypeInfo* wxGetTypeInfo( char * )
+template<> const wxTypeInfo* wxGetTypeInfo( char * )
 {
 	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 ;
 }
 
-const wxTypeInfo* wxGetTypeInfo( int * )
+template<> const wxTypeInfo* wxGetTypeInfo( int * )
 {
 	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 ;
 }
 
-const wxTypeInfo* wxGetTypeInfo( long * )
+template<> const wxTypeInfo* wxGetTypeInfo( long * )
 {
 	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 ;
 }
 
-const wxTypeInfo* wxGetTypeInfo( float * )
+template<> const wxTypeInfo* wxGetTypeInfo( float * )
 {
 	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 ;
 }
 
-const wxTypeInfo* wxGetTypeInfo( wxString * )
+template<> const wxTypeInfo* wxGetTypeInfo( wxString * )
 {
 	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 ** )
+WX_ILLEGAL_TYPE_SPECIALIZATION( char const * )
+WX_ILLEGAL_TYPE_SPECIALIZATION( char * )
+WX_ILLEGAL_TYPE_SPECIALIZATION( unsigned char * )
+WX_ILLEGAL_TYPE_SPECIALIZATION( int * )
+WX_ILLEGAL_TYPE_SPECIALIZATION( bool * )
+WX_ILLEGAL_TYPE_SPECIALIZATION( long * )
+WX_ILLEGAL_TYPE_SPECIALIZATION( wxString * )
+
+// ----------------------------------------------------------------------------
+// value streaming
+// ----------------------------------------------------------------------------
+
+// streamer specializations
+// for all built-in types
+
+// bool
+
+template<> void wxStringReadValue(const wxString &s , bool &data )
 {
-	assert(0) ;
-	static wxBuiltInTypeInfo s_typeInfo( wxT_VOID ) ;
-	return &s_typeInfo ;
+	int intdata ;
+	wxSscanf(s, _T("%d"), &intdata ) ;
+	data = bool(intdata) ;
 }
 
-void wxStringReadValue(const wxString & , const char* & )
+template<> void wxStringWriteValue(wxString &s , const bool &data )
 {
-	assert(0) ;
+	s = wxString::Format("%d", data ) ;
 }
 
-void wxStringWriteValue(wxString & , char const * const & )
+// char
+
+template<> void wxStringReadValue(const wxString &s , char &data )
 {
-	assert(0) ;
+	int intdata ;
+	wxSscanf(s, _T("%d"), &intdata ) ;
+	data = char(intdata) ;
 }
 
+template<> void wxStringWriteValue(wxString &s , const char &data )
+{
+	s = wxString::Format("%d", data ) ;
+}
 
-// ----------------------------------------------------------------------------
-// value streaming 
-// ----------------------------------------------------------------------------
+// unsigned char
 
-// convenience function (avoids including xml headers in users code)
+template<> void wxStringReadValue(const wxString &s , unsigned char &data )
+{
+	int intdata ;
+	wxSscanf(s, _T("%d"), &intdata ) ;
+	data = (unsigned char)(intdata) ;
+}
 
-void wxXmlAddContentToNode( wxXmlNode* node , const wxString& data ) 
+template<> void wxStringWriteValue(wxString &s , const unsigned char &data )
 {
-	node->AddChild(new wxXmlNode(wxXML_TEXT_NODE, "value", data ) ); 
+	s = wxString::Format("%d", data ) ;
 }
 
-wxString wxXmlGetContentFromNode( wxXmlNode *node ) 
+// int
+
+template<> void wxStringReadValue(const wxString &s , int &data )
 {
-	return node->GetChildren()->GetContent() ;
+	wxSscanf(s, _T("%d"), &data ) ;
 }
 
-// streamer specializations
+template<> void wxStringWriteValue(wxString &s , const int &data )
+{
+	s = wxString::Format("%d", data ) ;
+}
+
+// unsigned int
+
+template<> void wxStringReadValue(const wxString &s , unsigned int &data )
+{
+	wxSscanf(s, _T("%d"), &data ) ;
+}
 
-// TODO for all built-in types
+template<> void wxStringWriteValue(wxString &s , const unsigned int &data )
+{
+	s = wxString::Format("%d", data ) ;
+}
 
 // long
 
-void wxStringReadValue(const wxString &s , long &data )
+template<> void wxStringReadValue(const wxString &s , long &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 ) ;
 }
 
-// long
+// unsigned long
 
-void wxStringReadValue(const wxString &s , int &data )
+template<> void wxStringReadValue(const wxString &s , unsigned long &data )
 {
-	wxSscanf(s, _T("%d"), &data ) ;
+	wxSscanf(s, _T("%ld"), &data ) ;
 }
 
-void wxStringWriteValue(wxString &s , const int &data )
+template<> void wxStringWriteValue(wxString &s , const unsigned long &data )
 {
-	s = wxString::Format("%d", data ) ;
+	s = wxString::Format("%ld", data ) ;
+}
+
+// float
+
+template<> void wxStringReadValue(const wxString &s , float &data )
+{
+	wxSscanf(s, _T("%f"), &data ) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const float &data )
+{
+	s = wxString::Format("%f", data ) ;
+}
+
+// double
+
+template<> void wxStringReadValue(const wxString &s , double &data )
+{
+	wxSscanf(s, _T("%lf"), &data ) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const double &data )
+{
+	s = wxString::Format("%lf", data ) ;
 }
 
 // wxString
 
-void wxStringReadValue(const wxString &s , wxString &data )
+template<> void wxStringReadValue(const wxString &s , wxString &data )
 {
 	data = s ;
 }
 
-void wxStringWriteValue(wxString &s , const wxString &data )
+template<> void wxStringWriteValue(wxString &s , const wxString &data )
 {
 	s = data ;
 }
@@ -249,21 +315,84 @@ void wxStringWriteValue(wxString &s , const wxString &data )
 
 // 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 ) ;
 }
 
-void wxStringWriteValue(wxString &s , const wxPoint &data )
+template<> void wxStringWriteValue(wxString &s , const wxPoint &data )
 {
 	s = wxString::Format("%d,%d", data.x , data.y ) ;
 }
 
+template<> void wxStringReadValue(const wxString & , wxPoint* & )
+{
+    assert(0) ;
+}
+
+template<> void wxStringWriteValue(wxString & , wxPoint* const & )
+{
+    assert(0) ;
+}
+
 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 ) ;
+}
+
+template<> void wxStringReadValue(const wxString & , wxSize* & )
+{
+    assert(0) ;
+}
+
+template<> void wxStringWriteValue(wxString & , wxSize * const & )
+{
+    assert(0) ;
+}
+
+WX_CUSTOM_TYPE_INFO(wxSize)
+
+/*
+
+template<> void wxStringReadValue(const wxString &s , wxColour &data )
+{
+	// copied from VS xrc
+	unsigned long tmp = 0;
+
+    if (s.Length() != 7 || s[0u] != wxT('#') ||
+        wxSscanf(s.c_str(), wxT("#%lX"), &tmp) != 1)
+    {
+		wxLogError(_("String To Colour : Incorrect colour specification : %s"),
+                   s.c_str() );
+        data = wxNullColour;
+    }
+	else
+	{
+		data = wxColour((unsigned char) ((tmp & 0xFF0000) >> 16) ,
+                    (unsigned char) ((tmp & 0x00FF00) >> 8),
+                    (unsigned char) ((tmp & 0x0000FF)));
+	}
+}
+
+template<> void wxStringWriteValue(wxString &s , const wxColour &data )
+{
+	s = wxString::Format("#%2X%2X%2X", data.Red() , data.Green() , data.Blue() ) ;
+}
+
+WX_CUSTOM_TYPE_INFO(wxColour)
+
+*/
+
 // 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;
@@ -275,38 +404,20 @@ void wxSetStringToArray( const wxString &s , wxArrayString &array )
 }
 
 // ----------------------------------------------------------------------------
-// wxClassInfo 
+// wxClassInfo
 // ----------------------------------------------------------------------------
 
-
-void wxClassInfo::Register(const char *WXUNUSED(name), wxClassInfo *WXUNUSED(info))
-{
-	/*
-    if (!ExtendedTypeMap)
-	ExtendedTypeMap = new ClassMap;
-    (*ExtendedTypeMap)[string(Name)] = Info;
-	*/
-}
-
-void wxClassInfo::Unregister(const char *WXUNUSED(name))
-{
-	/*
-    assert(ExtendedTypeMap);
-    ExtendedTypeMap->erase(Name);
-	*/
-}
-
 const wxPropertyAccessor *wxClassInfo::FindAccessor(const char *PropertyName)
 {
-    const wxPropertyInfo* info = FindPropInfo( PropertyName ) ;
-	
+    const wxPropertyInfo* info = FindPropertyInfo( PropertyName ) ;
+
 	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() ;
 
@@ -320,13 +431,35 @@ const wxPropertyInfo *wxClassInfo::FindPropInfo (const char *PropertyName) const
 	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;
+}
+
+
 void wxClassInfo::SetProperty(wxObject *object, const char *propertyName, const wxxVariant &value)
 {
     const wxPropertyAccessor *accessor;
@@ -349,7 +482,7 @@ wxxVariant wxClassInfo::GetProperty(wxObject *object, const char *propertyName)
 VARIANT TO OBJECT
 */
 
-wxObject* wxxVariant::GetAsObject() const
+wxObject* wxxVariant::GetAsObject()
 {
 	const wxClassTypeInfo *ti = dynamic_cast<const wxClassTypeInfo*>( m_data->GetTypeInfo() ) ;
 	if ( ti )