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

Unicode copmile fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-11-06 10:45:44 +00:00
parent 0e808f5d5a
commit 0fce57ac76
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/src/xrc/xmlres.cpp
View File

@@ -271,7 +271,7 @@ static void ProcessPlatformProperty(wxXmlNode *node)
isok = TRUE; isok = TRUE;
else else
{ {
wxStringTokenizer tkn(s, " |"); wxStringTokenizer tkn(s, wxT(" |"));
while (tkn.HasMoreTokens()) while (tkn.HasMoreTokens())
{ {
@@ -497,7 +497,7 @@ static void MergeNodes(wxXmlNode& dest, wxXmlNode& with)
for (dnode = dest.GetChildren(); dnode; dnode = dnode->GetNext() ) for (dnode = dest.GetChildren(); dnode; dnode = dnode->GetNext() )
{ {
if ( dnode->GetName() == node->GetName() && if ( dnode->GetName() == node->GetName() &&
dnode->GetPropVal("name", wxEmptyString) == name && dnode->GetPropVal(wxT("name"), wxEmptyString) == name &&
dnode->GetType() == node->GetType() ) dnode->GetType() == node->GetType() )
{ {
MergeNodes(*dnode, *node); MergeNodes(*dnode, *node);

4
src/xrc/xmlres.cpp
View File

@@ -271,7 +271,7 @@ static void ProcessPlatformProperty(wxXmlNode *node)
isok = TRUE; isok = TRUE;
else else
{ {
wxStringTokenizer tkn(s, " |"); wxStringTokenizer tkn(s, wxT(" |"));
while (tkn.HasMoreTokens()) while (tkn.HasMoreTokens())
{ {
@@ -497,7 +497,7 @@ static void MergeNodes(wxXmlNode& dest, wxXmlNode& with)
for (dnode = dest.GetChildren(); dnode; dnode = dnode->GetNext() ) for (dnode = dest.GetChildren(); dnode; dnode = dnode->GetNext() )
{ {
if ( dnode->GetName() == node->GetName() && if ( dnode->GetName() == node->GetName() &&
dnode->GetPropVal("name", wxEmptyString) == name && dnode->GetPropVal(wxT("name"), wxEmptyString) == name &&
dnode->GetType() == node->GetType() ) dnode->GetType() == node->GetType() )
{ {
MergeNodes(*dnode, *node); MergeNodes(*dnode, *node);