allow multiple extensions in tge generic wxFileDialog (patch 457580)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -655,19 +655,25 @@ void wxFileCtrl::Update()
|
||||
f = wxFindNextFile();
|
||||
}
|
||||
|
||||
res = m_dirName + wxT("/") + m_wild;
|
||||
f = wxFindFirstFile( res.GetData(), wxFILE );
|
||||
while (!f.IsEmpty())
|
||||
// Tokenize the wildcard string, so we can handle more than 1
|
||||
// search pattern in a wildcard.
|
||||
wxStringTokenizer tokenWild( m_wild, ";" );
|
||||
while ( tokenWild.HasMoreTokens() )
|
||||
{
|
||||
res = wxFileNameFromPath( f );
|
||||
fd = new wxFileData( res, f );
|
||||
wxString s = fd->GetName();
|
||||
if (m_showHidden || (s[0u] != wxT('.')))
|
||||
res = m_dirName + wxT("/") + tokenWild.GetNextToken();
|
||||
f = wxFindFirstFile( res.GetData(), wxFILE );
|
||||
while (!f.IsEmpty())
|
||||
{
|
||||
Add( fd, item );
|
||||
item.m_itemId++;
|
||||
res = wxFileNameFromPath( f );
|
||||
fd = new wxFileData( res, f );
|
||||
wxString s = fd->GetName();
|
||||
if (m_showHidden || (s[0u] != wxT('.')))
|
||||
{
|
||||
Add( fd, item );
|
||||
item.m_itemId++;
|
||||
}
|
||||
f = wxFindNextFile();
|
||||
}
|
||||
f = wxFindNextFile();
|
||||
}
|
||||
|
||||
SortItems( ListCompare, 0 );
|
||||
|
Reference in New Issue
Block a user