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

Bug #208 llvm/​clang compile error

This commit is contained in:
Zane U. Ji 2014-03-19 19:47:10 +08:00
parent 878c981934
commit 705333a79a
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/xmlcopyeditor.cpp
View File

@ -2824,9 +2824,9 @@ void MyFrame::OnNew ( wxCommandEvent& WXUNUSED ( event ) )
{ {
wxString defaultSelection, typeSelection, templateFile; wxString defaultSelection, typeSelection, templateFile;
defaultSelection = _ ( "XML document (*.xml)" ); defaultSelection = _ ( "XML document (*.xml)" );
wxArrayString templateArray;
if ( wxDirExists ( templateDir ) ) if ( wxDirExists ( templateDir ) )
{ {
wxArrayString templateArray;
wxString templateMask, name, extension, entry; wxString templateMask, name, extension, entry;
wxFileName fn; wxFileName fn;
templateMask = templateDir + wxFileName::GetPathSeparator() + _T ( "*.*" ); templateMask = templateDir + wxFileName::GetPathSeparator() + _T ( "*.*" );
@ -2846,14 +2846,8 @@ void MyFrame::OnNew ( wxCommandEvent& WXUNUSED ( event ) )
templateArray.Sort(); templateArray.Sort();
templateArray.Insert ( defaultSelection, 0 ); templateArray.Insert ( defaultSelection, 0 );
const int arraySize = templateArray.GetCount();
wxString choiceArray[arraySize + 1];
for ( int i = 0; i < arraySize; ++i )
* ( choiceArray + i ) = templateArray.Item ( i );
wxSingleChoiceDialog scd ( wxSingleChoiceDialog scd (
this, _ ( "Choose a document type:" ), _ ( "New Document" ), arraySize, choiceArray ); this, _ ( "Choose a document type:" ), _ ( "New Document" ), templateArray );
if ( scd.ShowModal() == wxID_CANCEL ) if ( scd.ShowModal() == wxID_CANCEL )
{ {
XmlDoc *doc = getActiveDocument(); XmlDoc *doc = getActiveDocument();
@ -4262,20 +4256,13 @@ void MyFrame::OnEncoding ( wxCommandEvent& event )
if ( ( doc = getActiveDocument() ) == NULL ) if ( ( doc = getActiveDocument() ) == NULL )
return; return;
std::vector<wxString> encodingVector; const static wxString encodings[] = {
encodingVector.push_back ( _T ( "UTF-8" ) ); _T ( "UTF-8" ), _T ( "UTF-16" ), _T ( "UTF-16LE" ),
encodingVector.push_back ( _T ( "UTF-16" ) ); _T ( "UTF-16BE" ), _T ( "ISO-8859-1" ), _T ( "US-ASCII" )
encodingVector.push_back ( _T ( "UTF-16LE" ) ); };
encodingVector.push_back ( _T ( "UTF-16BE" ) );
encodingVector.push_back ( _T ( "ISO-8859-1" ) );
encodingVector.push_back ( _T ( "US-ASCII" ) );
const int vectorSize = encodingVector.size();
wxString choiceArray[vectorSize + 1];
for ( int i = 0; i < vectorSize; ++i )
* ( choiceArray + i ) = encodingVector.at ( i );
wxSingleChoiceDialog scd ( wxSingleChoiceDialog scd (
this, _ ( "Choose an encoding:" ), _ ( "Encoding" ), vectorSize, choiceArray ); this, _ ( "Choose an encoding:" ), _ ( "Encoding" ),
sizeof ( encodings ) / sizeof ( encodings[0] ), encodings );
if ( scd.ShowModal() == wxID_CANCEL ) if ( scd.ShowModal() == wxID_CANCEL )
return; return;