From a2983e1960be1af51dad56c3789365d3fd2b4ea6 Mon Sep 17 00:00:00 2001 From: "Zane U. Ji" Date: Fri, 13 Dec 2013 23:51:13 +0800 Subject: [PATCH] Replaced wxFileName::DirExists with wxDirExists --- src/styledialog.cpp | 4 ++-- src/xmlcopyeditor.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/styledialog.cpp b/src/styledialog.cpp index e09aab4..1b39725 100644 --- a/src/styledialog.cpp +++ b/src/styledialog.cpp @@ -315,7 +315,7 @@ StyleDialog::StyleDialog ( } // all other branches - if ( wxFileName::DirExists ( ruleSetDirectory ) ) + if ( wxDirExists ( ruleSetDirectory ) ) { wxString ruleMask, ruleFile; ruleMask = ruleSetDirectory + wxFileName::GetPathSeparator() + _T ( "*.xml" ); @@ -346,7 +346,7 @@ StyleDialog::StyleDialog ( ruleSetCombo->Select ( 0 ); } - if ( wxFileName::DirExists ( filterDirectory ) ) + if ( wxDirExists ( filterDirectory ) ) { filterCombo->Append ( _ ( "(No filter)" ) ); wxString filterMask, filterFile; diff --git a/src/xmlcopyeditor.cpp b/src/xmlcopyeditor.cpp index 0159048..1fb3b4e 100644 --- a/src/xmlcopyeditor.cpp +++ b/src/xmlcopyeditor.cpp @@ -1053,7 +1053,7 @@ MyFrame::MyFrame ( ( wxWindow * ) commandPanel, wxAuiPaneInfo().Bottom().Hide().Caption ( _T ( "Command" ) ).DestroyOnClose ( false ).Layer ( 3 ) ); - if ( !wxFileName::DirExists ( applicationDir ) ) + if ( !wxDirExists ( applicationDir ) ) #ifdef __WXMSW__ GetStatusBar()->SetStatusText ( _ ( "Cannot open application directory: see Tools, Options..., General" ) ); #else @@ -2836,7 +2836,7 @@ void MyFrame::OnNew ( wxCommandEvent& WXUNUSED ( event ) ) wxString defaultSelection, typeSelection, templateFile; defaultSelection = _ ( "XML document (*.xml)" ); wxArrayString templateArray; - if ( wxFileName::DirExists ( templateDir ) ) + if ( wxDirExists ( templateDir ) ) { wxString templateMask, name, extension, entry; wxFileName fn; @@ -5259,7 +5259,7 @@ wxMenuBar *MyFrame::getMenuBar() associateMenu->Append ( ID_ASSOCIATE_W3C_SCHEMA, _ ( "&XML Schema..." ), _ ( "XML Schema..." ) ); associateMenu->Append ( ID_ASSOCIATE_XSL, _ ( "XS< stylesheet..." ), _ ( "XSLT stylesheet..." ) ); - if ( wxFileName::DirExists ( rngDir ) ) + if ( wxDirExists ( rngDir ) ) { wxString rngMask, rngFile, displayName, shortcutString; rngMask = rngDir + wxFileName::GetPathSeparator() + _T ( "*.rng" );