Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unicode fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-08-26 00:28:38 +00:00
parent 3d82ef9b7c
commit 63691d4ff9
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/common/xtixml.cpp
View File

@@ -51,7 +51,7 @@ using namespace std ;
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, wxT("value"), data ) );
} }
wxString wxXmlGetContentFromNode( wxXmlNode *node ) wxString wxXmlGetContentFromNode( wxXmlNode *node )
@@ -97,7 +97,7 @@ void wxXmlWriter::DoBeginWriteTopLevelEntry( const wxString &name )
{ {
wxXmlNode *pnode; wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("entry")); pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("entry"));
pnode->AddProperty(wxString("name"), name); pnode->AddProperty(wxString(wxT("name")), name);
m_data->m_current->AddChild(pnode) ; m_data->m_current->AddChild(pnode) ;
m_data->Push( pnode ) ; m_data->Push( pnode ) ;
} }
@@ -112,7 +112,7 @@ void wxXmlWriter::DoBeginWriteObject(const wxObject *WXUNUSED(object), const wxC
wxXmlNode *pnode; wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object")); pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object"));
pnode->AddProperty(wxT("class"), wxString(classInfo->GetClassName())); pnode->AddProperty(wxT("class"), wxString(classInfo->GetClassName()));
pnode->AddProperty(wxT("id"), wxString::Format( "%d" , objectID ) ); pnode->AddProperty(wxT("id"), wxString::Format( wxT("%d") , objectID ) );
for ( size_t i = 0 ; i < metadata.GetCount() ; ++i ) for ( size_t i = 0 ; i < metadata.GetCount() ; ++i )
{ {
@@ -137,7 +137,7 @@ void wxXmlWriter::DoWriteSimpleType( wxxVariant &value )
void wxXmlWriter::DoBeginWriteElement() void wxXmlWriter::DoBeginWriteElement()
{ {
wxXmlNode *pnode; wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, "element" ); pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("element") );
m_data->m_current->AddChild(pnode) ; m_data->m_current->AddChild(pnode) ;
m_data->Push( pnode ) ; m_data->Push( pnode ) ;
} }
@@ -150,7 +150,7 @@ void wxXmlWriter::DoEndWriteElement()
void wxXmlWriter::DoBeginWriteProperty(const wxPropertyInfo *pi ) void wxXmlWriter::DoBeginWriteProperty(const wxPropertyInfo *pi )
{ {
wxXmlNode *pnode; wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, "prop" ); pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("prop") );
pnode->AddProperty(wxT("name"), pi->GetName() ); pnode->AddProperty(wxT("name"), pi->GetName() );
m_data->m_current->AddChild(pnode) ; m_data->m_current->AddChild(pnode) ;
m_data->Push( pnode ) ; m_data->Push( pnode ) ;
@@ -168,7 +168,7 @@ void wxXmlWriter::DoWriteRepeatedObject( int objectID )
{ {
wxXmlNode *pnode; wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object")); pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object"));
pnode->AddProperty(wxString("href"), wxString::Format( "%d" , objectID ) ); pnode->AddProperty(wxString(wxT("href")), wxString::Format( wxT("%d") , objectID ) );
m_data->m_current->AddChild(pnode) ; m_data->m_current->AddChild(pnode) ;
} }
@@ -223,18 +223,18 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
if (!children) if (!children)
{ {
// check for a null object or href // check for a null object or href
if (node->GetPropVal("href" , &ObjectIdString ) ) if (node->GetPropVal(wxT("href") , &ObjectIdString ) )
{ {
objectID = atoi( ObjectIdString.c_str() ) ; objectID = atoi( ObjectIdString.ToAscii() ) ;
wxASSERT_MSG( HasObjectClassInfo( objectID ) , wxT("Forward hrefs are not supported") ) ; wxASSERT_MSG( HasObjectClassInfo( objectID ) , wxT("Forward hrefs are not supported") ) ;
return objectID ; return objectID ;
} }
if ( !node->GetPropVal("id" , &ObjectIdString ) ) if ( !node->GetPropVal(wxT("id") , &ObjectIdString ) )
{ {
return wxNullObjectID; return wxNullObjectID;
} }
} }
if (!node->GetPropVal("class", &className)) if (!node->GetPropVal(wxT("class"), &className))
{ {
// No class name. Eek. FIXME: error handling // No class name. Eek. FIXME: error handling
return wxInvalidObjectID; return wxInvalidObjectID;
@@ -242,13 +242,13 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
classInfo = wxClassInfo::FindClass(className); classInfo = wxClassInfo::FindClass(className);
wxASSERT_MSG( classInfo , wxString::Format(wxT("unknown class %s"),className ) ) ; wxASSERT_MSG( classInfo , wxString::Format(wxT("unknown class %s"),className ) ) ;
wxASSERT_MSG( !children || children->GetType() != wxXML_TEXT_NODE , wxT("objects cannot have XML Text Nodes") ) ; wxASSERT_MSG( !children || children->GetType() != wxXML_TEXT_NODE , wxT("objects cannot have XML Text Nodes") ) ;
if (!node->GetPropVal("id", &ObjectIdString)) if (!node->GetPropVal(wxT("id"), &ObjectIdString))
{ {
wxASSERT_MSG(0,wxT("Objects must have an id attribute") ) ; wxASSERT_MSG(0,wxT("Objects must have an id attribute") ) ;
// No object id. Eek. FIXME: error handling // No object id. Eek. FIXME: error handling
return wxInvalidObjectID; return wxInvalidObjectID;
} }
objectID = atoi( ObjectIdString.c_str() ) ; objectID = atoi( ObjectIdString.ToAscii() ) ;
// is this object already has been streamed in, return it here // is this object already has been streamed in, return it here
wxASSERT_MSG( !HasObjectClassInfo( objectID ) , wxString::Format(wxT("Doubly used id : %d"), objectID ) ) ; wxASSERT_MSG( !HasObjectClassInfo( objectID ) , wxString::Format(wxT("Doubly used id : %d"), objectID ) ) ;
@@ -260,7 +260,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
wxXmlProperty *xp = node->GetProperties() ; wxXmlProperty *xp = node->GetProperties() ;
while ( xp ) while ( xp )
{ {
if ( xp->GetName() != wxString("class") && xp->GetName() != wxString("id") ) if ( xp->GetName() != wxString(wxT("class")) && xp->GetName() != wxString(wxT("id")) )
{ {
metadata.Add( new wxxVariant( xp->GetValue() , xp->GetName() ) ) ; metadata.Add( new wxxVariant( xp->GetValue() , xp->GetName() ) ) ;
} }
@@ -275,9 +275,13 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
createParamOids = new int[classInfo->GetCreateParamCount() ] ; createParamOids = new int[classInfo->GetCreateParamCount() ] ;
createClassInfos = new const wxClassInfo*[classInfo->GetCreateParamCount() ] ; createClassInfos = new const wxClassInfo*[classInfo->GetCreateParamCount() ] ;
#if wxUSE_UNICODE
typedef map<wstring, wxXmlNode *> PropertyNodes ;
typedef vector<wstring> PropertyNames ;
#else
typedef map<string, wxXmlNode *> PropertyNodes ; typedef map<string, wxXmlNode *> PropertyNodes ;
typedef vector<string> PropertyNames ; typedef vector<string> PropertyNames ;
#endif
PropertyNodes propertyNodes ; PropertyNodes propertyNodes ;
PropertyNames propertyNames ; PropertyNames propertyNames ;
@@ -295,7 +299,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
const wxChar* paramName = classInfo->GetCreateParamName(i) ; const wxChar* paramName = classInfo->GetCreateParamName(i) ;
PropertyNodes::iterator propiter = propertyNodes.find( paramName ) ; PropertyNodes::iterator propiter = propertyNodes.find( paramName ) ;
const wxPropertyInfo* pi = classInfo->FindPropertyInfo( paramName ) ; const wxPropertyInfo* pi = classInfo->FindPropertyInfo( paramName ) ;
wxASSERT_MSG(pi,wxString::Format("Unkown Property %s",paramName) ) ; wxASSERT_MSG(pi,wxString::Format(wxT("Unkown Property %s"),paramName) ) ;
// if we don't have the value of a create param set in the xml // if we don't have the value of a create param set in the xml
// we use the default value // we use the default value
if ( propiter != propertyNodes.end() ) if ( propiter != propertyNodes.end() )
@@ -326,7 +330,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
{ {
if ( propertyNames[j] == paramName ) if ( propertyNames[j] == paramName )
{ {
propertyNames[j] = "" ; propertyNames[j] = wxEmptyString ;
break ; break ;
} }
} }
@@ -430,7 +434,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
wxString resstring = prop->GetContent() ; wxString resstring = prop->GetContent() ;
wxInt32 pos = resstring.Find('.') ; wxInt32 pos = resstring.Find('.') ;
assert( pos != wxNOT_FOUND ) ; assert( pos != wxNOT_FOUND ) ;
int sinkOid = atol(resstring.Left(pos)) ; int sinkOid = atol(resstring.Left(pos).ToAscii()) ;
wxString handlerName = resstring.Mid(pos+1) ; wxString handlerName = resstring.Mid(pos+1) ;
wxClassInfo* sinkClassInfo = GetObjectClassInfo( sinkOid ) ; wxClassInfo* sinkClassInfo = GetObjectClassInfo( sinkOid ) ;
@@ -481,7 +485,7 @@ int wxXmlReader::ReadObject( const wxString &name , wxDepersister *callbacks)
while ( iter ) while ( iter )
{ {
wxString entryName ; wxString entryName ;
if ( iter->GetPropVal("name", &entryName) ) if ( iter->GetPropVal(wxT("name"), &entryName) )
{ {
if ( entryName == name ) if ( entryName == name )
return ReadComponent( iter->GetChildren() , callbacks ) ; return ReadComponent( iter->GetChildren() , callbacks ) ;