projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
document wxDb::ExecSql() 3 params overload (patch 1240839)
[wxWidgets.git]
/
src
/
common
/
xtixml.cpp
diff --git
a/src/common/xtixml.cpp
b/src/common/xtixml.cpp
index 3bd916c1902644d134aab7732924a2634c8bbde5..26fe3ac6cff03389c5e4ef733ef38308aa6d0257 100644
(file)
--- a/
src/common/xtixml.cpp
+++ b/
src/common/xtixml.cpp
@@
-233,7
+233,7
@@
int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
else
{
wxLogError( _("Forward hrefs are not supported") ) ;
else
{
wxLogError( _("Forward hrefs are not supported") ) ;
- return wxInvalidObjectID ;
+ return wxInvalidObjectID ;
}
}
if ( !node->GetPropVal(wxT("id") , &ObjectIdString ) )
}
}
if ( !node->GetPropVal(wxT("id") , &ObjectIdString ) )
@@
-255,7
+255,7
@@
int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
if ( children != NULL && children->GetType() == wxXML_TEXT_NODE )
{
if ( children != NULL && children->GetType() == wxXML_TEXT_NODE )
{
- wxLogError(_("objects cannot have XML Text Nodes") ) ;
+ wxLogError(_("objects cannot have XML Text Nodes") ) ;
return wxInvalidObjectID;
}
if (!node->GetPropVal(wxT("id"), &ObjectIdString))
return wxInvalidObjectID;
}
if (!node->GetPropVal(wxT("id"), &ObjectIdString))
@@
-268,7
+268,7
@@
int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
// is this object already has been streamed in, return it here
if ( HasObjectClassInfo( objectID ) )
{
// is this object already has been streamed in, return it here
if ( HasObjectClassInfo( objectID ) )
{
- wxLogError ( wxString::Format(_("Doubly used id : %d"), objectID ) ) ;
+ wxLogError ( wxString::Format(_("Doubly used id : %d"), objectID ) ) ;
return wxInvalidObjectID ;
}
return wxInvalidObjectID ;
}