#include "wx/filedlg.h"
#endif
-#include "wx/filename.h"
#include "wx/clntdata.h"
#include "wx/file.h" // for wxS_IXXX constants only
#include "wx/generic/dirctrlg.h" // for wxFileIconsTable
// wxFileListCtrl
//-----------------------------------------------------------------------------
-// FIXME: what is this for? It's never read
-static bool ignoreChanges = false;
-
IMPLEMENT_DYNAMIC_CLASS(wxFileListCtrl,wxListCtrl)
BEGIN_EVENT_TABLE(wxFileListCtrl,wxListCtrl)
{
wxArrayString names, paths;
wxArrayInt icons;
- size_t n, count = wxGetAvailableDrives(paths, names, icons);
+ const size_t count = wxGetAvailableDrives(paths, names, icons);
- for (n=0; n<count; n++)
+ for ( size_t n = 0; n < count; n++ )
{
- wxFileData *fd = new wxFileData(paths[n], names[n], wxFileData::is_drive, icons[n]);
+ // use paths[n] as the drive name too as our HandleAction() can't
+ // deal with the drive names (of the form "System (C:)") currently
+ // as it mistakenly treats them as file names
+ //
+ // it would be preferable to show names, and not paths, in the
+ // dialog just as the native dialog does but for this we must:
+ // a) store the item type as item data and modify HandleAction()
+ // to use it instead of wxDirExists() to check whether the item
+ // is a directory
+ // b) store the drives by their drive letters and not their
+ // descriptions as otherwise it's pretty confusing to the user
+ wxFileData *fd = new wxFileData(paths[n], paths[n],
+ wxFileData::is_drive, icons[n]);
if (Add(fd, item) != -1)
item.m_itemId++;
else
long id = FindItem( 0, fname );
if (id != wxNOT_FOUND)
{
- ignoreChanges = true;
SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
EnsureVisible( id );
- ignoreChanges = false;
}
}
}
m_dirName = dir;
UpdateFiles();
- ignoreChanges = true;
SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
- ignoreChanges = false;
EnsureVisible( 0 );
}
{
fd->SetNewName( new_name, event.GetLabel() );
- ignoreChanges = true;
SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
- ignoreChanges = false;
UpdateItem( event.GetItem() );
EnsureVisible( event.GetItem() );
return true;
}
+// NB: there is an unfortunate mismatch between wxFileName and wxFileDialog
+// method names but our GetDirectory() does correspond to wxFileName::
+// GetPath() while our GetPath() is wxFileName::GetFullPath()
wxString wxGenericFileCtrl::GetPath() const
{
- return DoGetFilename( true );
+ wxASSERT_MSG ( !(m_style & wxFC_MULTIPLE), "use GetPaths() instead" );
+
+ return DoGetFileName().GetFullPath();
}
wxString wxGenericFileCtrl::GetFilename() const
{
- return DoGetFilename( false );
+ wxASSERT_MSG ( !(m_style & wxFC_MULTIPLE), "use GetFilenames() instead" );
+
+ return DoGetFileName().GetFullName();
}
-wxString wxGenericFileCtrl::DoGetFilename( const bool fullPath ) const
+wxString wxGenericFileCtrl::GetDirectory() const
{
- wxASSERT_MSG( ( m_style & wxFC_MULTIPLE ) == 0,
- wxT( "With controls that has wxFC_MULTIPLE style " )
- wxT( "use GetFilenames/GetPaths to get all filenames/paths selected" ) );
+ // don't check for wxFC_MULTIPLE here, this one is probably safe to call in
+ // any case as it can be always taken to mean "current directory"
+ return DoGetFileName().GetPath();
+}
- const wxString value = m_text->GetValue();
+wxFileName wxGenericFileCtrl::DoGetFileName() const
+{
+ wxFileName fn;
- if ( !value.empty() )
- return value;
- return fullPath ? ( GetProperFileListDir() + value ) : value;
+ wxString value = m_text->GetValue();
+ if ( value.empty() )
+ {
+ // nothing in the text control, get the selected file from the list
+ wxListItem item;
+ item.m_itemId = m_list->GetNextItem(-1, wxLIST_NEXT_ALL,
+ wxLIST_STATE_SELECTED);
+ m_list->GetItem(item);
+
+ fn.Assign(m_list->GetDir(), item.m_text);
+ }
+ else // user entered the value
+ {
+ // the path can be either absolute or relative
+ fn.Assign(value);
+ if ( fn.IsRelative() )
+ fn.MakeAbsolute(m_list->GetDir());
+ }
+
+ return fn;
}
void wxGenericFileCtrl::DoGetFilenames( wxArrayString& filenames, const bool fullPath ) const
{
- filenames.Empty();
+ filenames.clear();
- const wxString dir = GetProperFileListDir();
- const wxString value = m_text->GetValue();
+ const wxString dir = m_list->GetDir();
+ const wxString value = m_text->GetValue();
if ( !value.empty() )
{
- if ( fullPath )
- filenames.Add( dir + value );
- else
- filenames.Add( value );
+ wxFileName fn(value);
+ if ( fn.IsRelative() )
+ fn.MakeAbsolute(dir);
+
+ filenames.push_back(fullPath ? fn.GetFullPath() : fn.GetFullName());
return;
}
- if ( m_list->GetSelectedItemCount() == 0 )
- {
+ const int numSel = m_list->GetSelectedItemCount();
+ if ( !numSel )
return;
- }
- filenames.Alloc( m_list->GetSelectedItemCount() );
+ filenames.reserve(numSel);
wxListItem item;
item.m_mask = wxLIST_MASK_TEXT;
-
- item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
- while ( item.m_itemId != -1 )
+ item.m_itemId = -1;
+ for ( ;; )
{
- m_list->GetItem( item );
+ item.m_itemId = m_list->GetNextItem(item.m_itemId, wxLIST_NEXT_ALL,
+ wxLIST_STATE_SELECTED);
- if ( fullPath )
- filenames.Add( dir + item.m_text );
- else
- filenames.Add( item.m_text );
+ if ( item.m_itemId == -1 )
+ break;
- item.m_itemId = m_list->GetNextItem( item.m_itemId,
- wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+ m_list->GetItem(item);
+
+ const wxFileName fn(dir, item.m_text);
+ filenames.push_back(fullPath ? fn.GetFullPath() : fn.GetFullName());
}
}
return wxFileName( dir ).SameAs( m_list->GetDir() );
}
-wxString wxGenericFileCtrl::GetDirectory() const
-{
- return m_list->GetDir();
-}
-
bool wxGenericFileCtrl::SetFilename( const wxString& name )
{
const long item = m_list->FindItem( -1, name );
UpdateControls();
}
-wxString wxGenericFileCtrl::GetProperFileListDir() const
-{
- wxString dir = m_list->GetDir();
-#ifdef __UNIX__
- if ( dir != wxT( "/" ) )
-#elif defined(__WXWINCE__)
- if ( dir != wxT( "/" ) && dir != wxT( "\\" ) )
-#endif
- dir += wxFILE_SEP_PATH;
-
- return dir;
-}
-
#endif // wxUSE_FILECTRL
projects / wxWidgets.git / blobdiff