From f51059a54e9f59d61cfeddf80847ae7eab4d02e0 Mon Sep 17 00:00:00 2001 From: "Zane U. Ji" Date: Wed, 5 Sep 2012 20:38:34 +0800 Subject: [PATCH] Honored a network control option Backed out freezing UI code to let status bar updated --- src/wraplibxml.cpp | 2 +- src/xmlcopyeditor.cpp | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/wraplibxml.cpp b/src/wraplibxml.cpp index 320ed2b..d1c6817 100755 --- a/src/wraplibxml.cpp +++ b/src/wraplibxml.cpp @@ -441,7 +441,7 @@ bool WrapLibxml::bufferWellFormed ( const std::string& buffer ) buffer.size(), "", "UTF-8", - 0 ); + ( netAccess ) ? XML_PARSE_DTDLOAD : XML_PARSE_DTDLOAD | XML_PARSE_NONET ); bool returnValue = ( docPtr ) ? true : false; xmlFreeDoc ( docPtr ); diff --git a/src/xmlcopyeditor.cpp b/src/xmlcopyeditor.cpp index 2bcd0e5..c16e38a 100755 --- a/src/xmlcopyeditor.cpp +++ b/src/xmlcopyeditor.cpp @@ -3018,12 +3018,9 @@ void MyFrame::OnOpen ( wxCommandEvent& event ) size_t count = paths.Count(); if ( !count ) return; - Freeze(); for ( size_t i = 0; i < count; ++i ) if ( !openFile ( paths[i], largeFile ) ) break; - Thaw(); - mainBook->Layout(); } bool MyFrame::openFile ( wxString& fileName, bool largeFile ) @@ -6043,8 +6040,6 @@ void MyFrame::OnAssociate ( wxCommandEvent& event ) void MyFrame::openRememberedTabs() { - Freeze(); - wxStringTokenizer files ( openTabsOnClose, _T ( "|" ) ); while ( files.HasMoreTokens() ) { @@ -6053,9 +6048,6 @@ void MyFrame::openRememberedTabs() continue; //break; // Ignore errors } - Thaw(); - mainBook->Layout(); - XmlDoc *doc; if ( ( doc = getActiveDocument() ) != NULL ) doc->SetFocus();