X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8548d99ac2708f19c42fcf8b7bbdf3036548929..c5cc7fbd27fb53c36beb0ade36153ae48d9e961e:/src/generic/filectrlg.cpp diff --git a/src/generic/filectrlg.cpp b/src/generic/filectrlg.cpp index f85cf1d342..172eda6d2f 100644 --- a/src/generic/filectrlg.cpp +++ b/src/generic/filectrlg.cpp @@ -28,12 +28,12 @@ #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 #include "wx/dir.h" #include "wx/tokenzr.h" +#include "wx/imaglist.h" #ifdef __WXMSW__ #include "wx/msw/wrapwin.h" @@ -53,7 +53,7 @@ // ---------------------------------------------------------------------------- static -int wxCALLBACK wxFileDataNameCompare( long data1, long data2, long sortOrder) +int wxCALLBACK wxFileDataNameCompare( long data1, long data2, wxIntPtr sortOrder) { wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); @@ -71,7 +71,7 @@ int wxCALLBACK wxFileDataNameCompare( long data1, long data2, long sortOrder) } static -int wxCALLBACK wxFileDataSizeCompare(long data1, long data2, long sortOrder) +int wxCALLBACK wxFileDataSizeCompare(long data1, long data2, wxIntPtr sortOrder) { wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); @@ -93,7 +93,7 @@ int wxCALLBACK wxFileDataSizeCompare(long data1, long data2, long sortOrder) } static -int wxCALLBACK wxFileDataTypeCompare(long data1, long data2, long sortOrder) +int wxCALLBACK wxFileDataTypeCompare(long data1, long data2, wxIntPtr sortOrder) { wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); @@ -115,7 +115,7 @@ int wxCALLBACK wxFileDataTypeCompare(long data1, long data2, long sortOrder) } static -int wxCALLBACK wxFileDataTimeCompare(long data1, long data2, long sortOrder) +int wxCALLBACK wxFileDataTimeCompare(long data1, long data2, wxIntPtr sortOrder) { wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); @@ -194,7 +194,7 @@ void wxFileData::ReadData() 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; @@ -245,25 +245,25 @@ void wxFileData::ReadData() // __WXWINCE__ #if defined(__UNIX__) - m_permissions.Printf(_T("%c%c%c%c%c%c%c%c%c"), - buff.st_mode & wxS_IRUSR ? _T('r') : _T('-'), - buff.st_mode & wxS_IWUSR ? _T('w') : _T('-'), - buff.st_mode & wxS_IXUSR ? _T('x') : _T('-'), - buff.st_mode & wxS_IRGRP ? _T('r') : _T('-'), - buff.st_mode & wxS_IWGRP ? _T('w') : _T('-'), - buff.st_mode & wxS_IXGRP ? _T('x') : _T('-'), - buff.st_mode & wxS_IROTH ? _T('r') : _T('-'), - buff.st_mode & wxS_IWOTH ? _T('w') : _T('-'), - buff.st_mode & wxS_IXOTH ? _T('x') : _T('-')); + m_permissions.Printf(wxT("%c%c%c%c%c%c%c%c%c"), + buff.st_mode & wxS_IRUSR ? wxT('r') : wxT('-'), + buff.st_mode & wxS_IWUSR ? wxT('w') : wxT('-'), + buff.st_mode & wxS_IXUSR ? wxT('x') : wxT('-'), + buff.st_mode & wxS_IRGRP ? wxT('r') : wxT('-'), + buff.st_mode & wxS_IWGRP ? wxT('w') : wxT('-'), + buff.st_mode & wxS_IXGRP ? wxT('x') : wxT('-'), + buff.st_mode & wxS_IROTH ? wxT('r') : wxT('-'), + buff.st_mode & wxS_IWOTH ? wxT('w') : wxT('-'), + buff.st_mode & wxS_IXOTH ? wxT('x') : wxT('-')); #elif defined(__WIN32__) DWORD attribs = ::GetFileAttributes(m_filePath.c_str()); if (attribs != (DWORD)-1) { - m_permissions.Printf(_T("%c%c%c%c"), - attribs & FILE_ATTRIBUTE_ARCHIVE ? _T('A') : _T(' '), - attribs & FILE_ATTRIBUTE_READONLY ? _T('R') : _T(' '), - attribs & FILE_ATTRIBUTE_HIDDEN ? _T('H') : _T(' '), - attribs & FILE_ATTRIBUTE_SYSTEM ? _T('S') : _T(' ')); + m_permissions.Printf(wxT("%c%c%c%c"), + attribs & FILE_ATTRIBUTE_ARCHIVE ? wxT('A') : wxT(' '), + attribs & FILE_ATTRIBUTE_READONLY ? wxT('R') : wxT(' '), + attribs & FILE_ATTRIBUTE_HIDDEN ? wxT('H') : wxT(' '), + attribs & FILE_ATTRIBUTE_SYSTEM ? wxT('S') : wxT(' ')); } #endif @@ -357,7 +357,7 @@ wxString wxFileData::GetEntry( fileListFieldType num ) const #endif // defined(__UNIX__) || defined(__WIN32__) default: - wxFAIL_MSG( _T("unexpected field in wxFileData::GetEntry()") ); + wxFAIL_MSG( wxT("unexpected field in wxFileData::GetEntry()") ); } return s; @@ -382,7 +382,7 @@ void wxFileData::MakeItem( wxListItem &item ) if (IsLink()) { - wxColour dg = wxTheColourDatabase->Find( _T("MEDIUM GREY") ); + wxColour dg = wxTheColourDatabase->Find( wxT("MEDIUM GREY") ); if ( dg.Ok() ) item.SetTextColour(dg); } @@ -393,9 +393,6 @@ void wxFileData::MakeItem( wxListItem &item ) // wxFileListCtrl //----------------------------------------------------------------------------- -// FIXME: what is this for? It's never read -static bool ignoreChanges = false; - IMPLEMENT_DYNAMIC_CLASS(wxFileListCtrl,wxListCtrl) BEGIN_EVENT_TABLE(wxFileListCtrl,wxListCtrl) @@ -722,10 +719,8 @@ void wxFileListCtrl::GoToParentDir() long id = FindItem( 0, fname ); if (id != wxNOT_FOUND) { - ignoreChanges = true; SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); EnsureVisible( id ); - ignoreChanges = false; } } } @@ -743,9 +738,7 @@ void wxFileListCtrl::GoToDir( const wxString &dir ) m_dirName = dir; UpdateFiles(); - ignoreChanges = true; SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); - ignoreChanges = false; EnsureVisible( 0 ); } @@ -818,9 +811,7 @@ void wxFileListCtrl::OnListEndLabelEdit( wxListEvent &event ) { 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() ); @@ -922,6 +913,7 @@ bool wxGenericFileCtrl::Create( wxWindow *parent, 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 ) ), @@ -957,10 +949,11 @@ bool wxGenericFileCtrl::Create( wxWindow *parent, 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 ) ) @@ -989,33 +982,25 @@ bool wxGenericFileCtrl::Create( wxWindow *parent, 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 ); @@ -1040,67 +1025,102 @@ bool wxGenericFileCtrl::Create( wxWindow *parent, 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)); } } @@ -1114,11 +1134,6 @@ bool wxGenericFileCtrl::SetDirectory( const wxString& dir ) 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 ); @@ -1158,15 +1173,17 @@ bool wxGenericFileCtrl::SetFilename( const wxString& 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(pcd))->GetData()); m_list->SetWild( str ); m_filterIndex = filterindex; if ( str.Left( 2 ) == wxT( "*." ) ) { m_filterExtension = str.Mid( 1 ); - if ( m_filterExtension == _T( ".*" ) ) + if ( m_filterExtension == wxT( ".*" ) ) m_filterExtension.clear(); } else @@ -1279,7 +1296,7 @@ void wxGenericFileCtrl::OnSelected( wxListEvent &event ) return; } - + m_ignoreChanges = true; m_text->SetValue( filename ); @@ -1412,7 +1429,7 @@ bool wxGenericFileCtrl::SetPath( const wxString& path ) 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( "." ); @@ -1453,17 +1470,4 @@ void wxGenericFileCtrl::GoToHomeDir() 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