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

fix GetPaths() and GetFilenames() too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-06 00:14:21 +00:00
parent 398eebb155
commit 7d42f4d61b
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/generic/filectrlg.cpp
View File

@@ -1082,42 +1082,42 @@ wxFileName wxGenericFileCtrl::DoGetFileName() const
void wxGenericFileCtrl::DoGetFilenames( wxArrayString& filenames, const bool fullPath ) const void wxGenericFileCtrl::DoGetFilenames( wxArrayString& filenames, const bool fullPath ) const
{ {
filenames.Empty(); filenames.clear();
const wxString dir = m_list->GetDir(); const wxString dir = m_list->GetDir();
const wxString value = m_text->GetValue();
const wxString value = m_text->GetValue();
if ( !value.empty() ) if ( !value.empty() )
{ {
if ( fullPath ) wxFileName fn(value);
filenames.Add( dir + value ); if ( fn.IsRelative() )
else fn.MakeAbsolute(dir);
filenames.Add( value );
filenames.push_back(fullPath ? fn.GetFullPath() : fn.GetFullName());
return; return;
} }
if ( m_list->GetSelectedItemCount() == 0 ) const int numSel = m_list->GetSelectedItemCount();
{ if ( !numSel )
return; return;
}
filenames.Alloc( m_list->GetSelectedItemCount() ); filenames.reserve(numSel);
wxListItem item; wxListItem item;
item.m_mask = wxLIST_MASK_TEXT; item.m_mask = wxLIST_MASK_TEXT;
item.m_itemId = -1;
item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); for ( ;; )
while ( item.m_itemId != -1 )
{ {
m_list->GetItem( item ); item.m_itemId = m_list->GetNextItem(item.m_itemId, wxLIST_NEXT_ALL,
wxLIST_STATE_SELECTED);
if ( fullPath ) if ( item.m_itemId == -1 )
filenames.Add( dir + item.m_text ); break;
else
filenames.Add( item.m_text );
item.m_itemId = m_list->GetNextItem( item.m_itemId, m_list->GetItem(item);
wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
const wxFileName fn(dir, item.m_text);
filenames.push_back(fullPath ? fn.GetFullPath() : fn.GetFullName());
} }
} }