Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the common wxParseCommonDialogsFilter function

Browse Source 
in wxMotif wxFileDialog.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2005-03-05 17:16:44 +00:00
parent 80f7ea17cb
commit 0fcb9befd9
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/motif/filedlg.cpp
View File

@@ -100,18 +100,19 @@ static wxString ParseWildCard( const wxString& wild )
_T("wildcard syntax"); _T("wildcard syntax");
#endif #endif
wxStringTokenizer tok( wild, _T("|") ); wxArrayString wildDescriptions, wildFilters;
const size_t count = wxParseCommonDialogsFilter(wild,
wildDescriptions,
wildFilters);
wxCHECK_MSG( count, _T("*.*"), wxT("wxFileDialog: bad wildcard string") );
wxCHECK_MSG( count == 1, _T("*.*"), msg );
wxCHECK_MSG( tok.CountTokens() <= 2, _T("*.*"), msg ); // check for *.txt;*.rtf
wxStringTokenizer tok2( wildFilters[0], _T(";") );
wxString wildcard = tok2.GetNextToken();
if( tok.CountTokens() == 1 ) return wild; wxCHECK_MSG( tok2.CountTokens() <= 1, wildcard, msg );
return wildcard;
// CountTokens == 2
tok.GetNextToken();
wxStringTokenizer tok2( tok.GetNextToken(), _T(";") );
wxCHECK_MSG( tok2.CountTokens() == 1, tok2.GetNextToken(), msg );
return tok2.GetNextToken();
} }
wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,