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

fixed bug in default filter string construction (you can't Printf() a string in itself)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-04-20 11:35:49 +00:00
parent c878ceeae8
commit 40bb1d31d9
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/fldlgcmn.cpp
View File

@@ -48,19 +48,16 @@ wxFileDialogBase::wxFileDialogBase(wxWindow *parent,
m_message = message; m_message = message;
m_dir = defaultDir; m_dir = defaultDir;
m_fileName = defaultFile; m_fileName = defaultFile;
m_wildCard = wildCard; m_wildCard = wildCard.empty() ? wxFileSelectorDefaultWildcardStr : wildCard;
m_dialogStyle = style; m_dialogStyle = style;
m_path = wxT(""); m_path = wxT("");
m_filterIndex = 0; m_filterIndex = 0;
if (m_wildCard.IsEmpty())
m_wildCard = wxFileSelectorDefaultWildcardStr;
// convert m_wildCard from "*.bar" to "Files (*.bar)|*.bar" // convert m_wildCard from "*.bar" to "Files (*.bar)|*.bar"
if ( m_wildCard.Find(wxT('|')) == wxNOT_FOUND ) if ( m_wildCard.Find(wxT('|')) == wxNOT_FOUND )
{ {
m_wildCard.Printf(_("Files (%s)|%s"), m_wildCard = wxString::Format(_("Files (%s)|%s"),
m_wildCard.c_str(), m_wildCard.c_str()); m_wildCard.c_str(), m_wildCard.c_str());
} }
} }