Fix history in wxWebViewIE when using a custom file scheme.

[wxWidgets.git] / src / common / xtixml.cpp

diff --git a/src/common/xtixml.cpp b/src/common/xtixml.cpp
index f6f2da545f221f3cb2fdd45dbe0e88bb216df144..33fb30d3415bc993315d3b32eb45538d593795ff 100644 (file)
--- a/src/common/xtixml.cpp
+++ b/src/common/xtixml.cpp
@@ -399,7 +399,7 @@ int wxObjectXmlReader::ReadComponent(wxXmlNode *node, wxObjectReaderCallback *ca
     // properties were written in the xml
     for ( size_t j = 0; j < propertyNames.size(); ++j )
     {
     // properties were written in the xml
     for ( size_t j = 0; j < propertyNames.size(); ++j )
     {

-        if ( propertyNames[j].length() )
+        if ( !propertyNames[j].empty() )

         {
             PropertyNodes::iterator propiter = propertyNodes.find( propertyNames[j] );
             if ( propiter != propertyNodes.end() )
         {
             PropertyNodes::iterator propiter = propertyNodes.find( propertyNames[j] );
             if ( propiter != propertyNodes.end() )


@@ -483,7 +483,7 @@ int wxObjectXmlReader::ReadComponent(wxXmlNode *node, wxObjectReaderCallback *ca
                             wxClassInfo* sinkClassInfo = GetObjectClassInfo( sinkOid );
 
                             callbacks->SetConnect( objectID, classInfo, pi, sinkClassInfo,
                             wxClassInfo* sinkClassInfo = GetObjectClassInfo( sinkOid );
 
                             callbacks->SetConnect( objectID, classInfo, pi, sinkClassInfo,

-                                sinkClassInfo->FindHandlerInfo(handlerName),  sinkOid );
+                                sinkClassInfo->FindHandlerInfo(handlerName.c_str()),  sinkOid );

                         }
                         else
                         {
                         }
                         else
                         {