neox
/
xml-copy-editor-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Honored a network control option 

Backed out freezing UI code to let status bar updated
This commit is contained in:
Zane U. Ji 2012-09-05 20:38:34 +08:00
parent b5d4655986
commit f51059a54e
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wraplibxml.cpp
View File

@ -441,7 +441,7 @@ bool WrapLibxml::bufferWellFormed ( const std::string& buffer )
buffer.size(), buffer.size(),
"", "",
"UTF-8", "UTF-8",
0 ); ( netAccess ) ? XML_PARSE_DTDLOAD : XML_PARSE_DTDLOAD | XML_PARSE_NONET );
bool returnValue = ( docPtr ) ? true : false; bool returnValue = ( docPtr ) ? true : false;
xmlFreeDoc ( docPtr ); xmlFreeDoc ( docPtr );

8
src/xmlcopyeditor.cpp
View File

@ -3018,12 +3018,9 @@ void MyFrame::OnOpen ( wxCommandEvent& event )
size_t count = paths.Count(); size_t count = paths.Count();
if ( !count ) if ( !count )
return; return;
Freeze();
for ( size_t i = 0; i < count; ++i ) for ( size_t i = 0; i < count; ++i )
if ( !openFile ( paths[i], largeFile ) ) if ( !openFile ( paths[i], largeFile ) )
break; break;
Thaw();
mainBook->Layout();
} }
bool MyFrame::openFile ( wxString& fileName, bool largeFile ) bool MyFrame::openFile ( wxString& fileName, bool largeFile )
@ -6043,8 +6040,6 @@ void MyFrame::OnAssociate ( wxCommandEvent& event )
void MyFrame::openRememberedTabs() void MyFrame::openRememberedTabs()
{ {
Freeze();
wxStringTokenizer files ( openTabsOnClose, _T ( "|" ) ); wxStringTokenizer files ( openTabsOnClose, _T ( "|" ) );
while ( files.HasMoreTokens() ) while ( files.HasMoreTokens() )
{ {
@ -6053,9 +6048,6 @@ void MyFrame::openRememberedTabs()
continue; //break; // Ignore errors continue; //break; // Ignore errors
} }
Thaw();
mainBook->Layout();
XmlDoc *doc; XmlDoc *doc;
if ( ( doc = getActiveDocument() ) != NULL ) if ( ( doc = getActiveDocument() ) != NULL )
doc->SetFocus(); doc->SetFocus();