Honored a network control option
Backed out freezing UI code to let status bar updated
This commit is contained in:
parent
b5d4655986
commit
f51059a54e
|
@ -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 );
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue