#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
m_type |= (fileAttribs & FILE_ATTRIBUTE_DIRECTORY) != 0 ? is_dir : 0;
wxString p, f, ext;
- wxSplitPath(m_filePath, & p, & f, & ext);
+ wxFileName::SplitPath(m_filePath, & p, & f, & ext);
if (wxStricmp(ext, wxT("exe")) == 0)
m_type |= is_exe;
// wxFileListCtrl
//-----------------------------------------------------------------------------
-// FIXME: what is this for? It's never read
-static bool ignoreChanges = false;
-
IMPLEMENT_DYNAMIC_CLASS(wxFileListCtrl,wxListCtrl)
BEGIN_EVENT_TABLE(wxFileListCtrl,wxListCtrl)
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() );
this->m_style = style;
m_inSelected = false;
m_noSelChgEvent = false;
+ m_check = NULL;
// check that the styles are not contradictory
wxASSERT_MSG( !( ( m_style & wxFC_SAVE ) && ( m_style & wxFC_OPEN ) ),
wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
if ( is_pda )
- staticsizer->Add( new wxStaticText( this, wxID_ANY, _( "Current directory:" ) ), 0, wxRIGHT, 10 );
+ staticsizer->Add( new wxStaticText( this, wxID_ANY, _( "Current directory:" ) ),
+ wxSizerFlags().DoubleBorder(wxRIGHT) );
m_static = new wxStaticText( this, wxID_ANY, m_dir );
staticsizer->Add( m_static, 1 );
- mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 10 );
+ mainsizer->Add( staticsizer, wxSizerFlags().Expand().Border());
long style2 = wxLC_LIST;
if ( !( m_style & wxFC_MULTIPLE ) )
wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
textsizer->Add( m_text, wxSizerFlags( 1 ).Centre().Border() );
+ textsizer->Add( m_choice, wxSizerFlags( 1 ).Centre().Border() );
mainsizer->Add( textsizer, wxSizerFlags().Expand() );
- m_check = NULL;
- textsizer->Add( m_choice, wxSizerFlags( 1 ).Centre().Border() );
}
else // !is_pda
{
- mainsizer->Add( m_list, wxSizerFlags( 1 ).Expand().DoubleHorzBorder() );
-
- wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
- textsizer->Add( m_text, wxSizerFlags( 1 ).Centre().
- DoubleBorder( wxLEFT | wxRIGHT | wxTOP ) );
- mainsizer->Add( textsizer, wxSizerFlags().Expand() );
-
- wxSizerFlags flagsCentre;
- flagsCentre.Centre().DoubleBorder();
+ mainsizer->Add( m_list, wxSizerFlags( 1 ).Expand().Border() );
+ mainsizer->Add( m_text, wxSizerFlags().Expand().Border() );
wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );
- choicesizer->Add( m_choice, wxSizerFlags( flagsCentre ).Proportion( 1 ) );
+ choicesizer->Add( m_choice, wxSizerFlags( 1 ).Centre() );
if ( !( m_style & wxFC_NOSHOWHIDDEN ) )
- {
+ {
m_check = new wxCheckBox( this, ID_CHECK, _( "Show &hidden files" ) );
- choicesizer->Add( m_check, flagsCentre );
- }
+ choicesizer->Add( m_check, wxSizerFlags().Centre().DoubleBorder(wxLEFT) );
+ }
- mainsizer->Add( choicesizer, wxSizerFlags().Expand() );
+ mainsizer->Add( choicesizer, wxSizerFlags().Expand().Border() );
}
SetWildcard( wildCard );
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::GetDirectory() const
+{
+ // 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();
}
-wxString wxGenericFileCtrl::DoGetFilename( const bool fullPath ) const
+wxFileName wxGenericFileCtrl::DoGetFileName() 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" ) );
+ wxFileName fn;
- const wxString value = m_text->GetValue();
+ 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);
- if ( !value.empty() )
- return value;
- return fullPath ? ( GetProperFileListDir() + value ) : value;
+ 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
+// helper used in DoGetFilenames() and needed because Borland can't compile
+// operator?: inline
+static inline wxString GetFileNameOrPath(const wxFileName& fn, bool fullPath)
{
- filenames.Empty();
+ return fullPath ? fn.GetFullPath() : fn.GetFullName();
+}
- const wxString dir = GetProperFileListDir();
- const wxString value = m_text->GetValue();
+void
+wxGenericFileCtrl::DoGetFilenames(wxArrayString& filenames, bool fullPath) const
+{
+ filenames.clear();
+
+ 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(GetFileNameOrPath(fn, fullPath));
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 ( item.m_itemId == -1 )
+ break;
- if ( fullPath )
- filenames.Add( dir + item.m_text );
- else
- filenames.Add( item.m_text );
+ m_list->GetItem(item);
- item.m_itemId = m_list->GetNextItem( item.m_itemId,
- wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+ const wxFileName fn(dir, item.m_text);
+ filenames.push_back(GetFileNameOrPath(fn, fullPath));
}
}
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 );
void wxGenericFileCtrl::DoSetFilterIndex( int filterindex )
{
- const wxString& str = (wx_static_cast(wxStringClientData *,
- m_choice->GetClientObject( filterindex )))
- ->GetData();
+ wxClientData *pcd = m_choice->GetClientObject( filterindex );
+ if ( !pcd )
+ return;
+
+ const wxString& str = ((static_cast<wxStringClientData *>(pcd))->GetData());
m_list->SetWild( str );
m_filterIndex = filterindex;
if ( str.Left( 2 ) == wxT( "*." ) )
return;
}
-
+
m_ignoreChanges = true;
m_text->SetValue( filename );
return false;
wxString ext;
- wxSplitPath( path, &m_dir, &m_fileName, &ext );
+ wxFileName::SplitPath( path, &m_dir, &m_fileName, &ext );
if ( !ext.empty() )
{
m_fileName += wxT( "." );
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