From 0fce57ac76699b4094547e44829a3f1c8f911005 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Wed, 6 Nov 2002 10:45:44 +0000 Subject: [PATCH] Unicode copmile fix. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/xrc/xmlres.cpp | 4 ++-- src/xrc/xmlres.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp index f862795a2d..b8fe981d98 100644 --- a/contrib/src/xrc/xmlres.cpp +++ b/contrib/src/xrc/xmlres.cpp @@ -271,7 +271,7 @@ static void ProcessPlatformProperty(wxXmlNode *node) isok = TRUE; else { - wxStringTokenizer tkn(s, " |"); + wxStringTokenizer tkn(s, wxT(" |")); while (tkn.HasMoreTokens()) { @@ -497,7 +497,7 @@ static void MergeNodes(wxXmlNode& dest, wxXmlNode& with) for (dnode = dest.GetChildren(); dnode; dnode = dnode->GetNext() ) { if ( dnode->GetName() == node->GetName() && - dnode->GetPropVal("name", wxEmptyString) == name && + dnode->GetPropVal(wxT("name"), wxEmptyString) == name && dnode->GetType() == node->GetType() ) { MergeNodes(*dnode, *node); diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index f862795a2d..b8fe981d98 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -271,7 +271,7 @@ static void ProcessPlatformProperty(wxXmlNode *node) isok = TRUE; else { - wxStringTokenizer tkn(s, " |"); + wxStringTokenizer tkn(s, wxT(" |")); while (tkn.HasMoreTokens()) { @@ -497,7 +497,7 @@ static void MergeNodes(wxXmlNode& dest, wxXmlNode& with) for (dnode = dest.GetChildren(); dnode; dnode = dnode->GetNext() ) { if ( dnode->GetName() == node->GetName() && - dnode->GetPropVal("name", wxEmptyString) == name && + dnode->GetPropVal(wxT("name"), wxEmptyString) == name && dnode->GetType() == node->GetType() ) { MergeNodes(*dnode, *node);