#include "wx/generic/dirctrlg.h" // for wxFileIconsTable
#include "wx/dir.h"
#include "wx/tokenzr.h"
+#include "wx/imaglist.h"
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
#include "wx/msw/wrapwin.h"
#endif
// ----------------------------------------------------------------------------
static
-int wxCALLBACK wxFileDataNameCompare( long data1, long data2, long sortOrder)
+int wxCALLBACK wxFileDataNameCompare( wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)
{
wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
}
static
-int wxCALLBACK wxFileDataSizeCompare(long data1, long data2, long sortOrder)
+int wxCALLBACK wxFileDataSizeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)
{
wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
}
static
-int wxCALLBACK wxFileDataTypeCompare(long data1, long data2, long sortOrder)
+int wxCALLBACK wxFileDataTypeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)
{
wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
}
static
-int wxCALLBACK wxFileDataTimeCompare(long data1, long data2, long sortOrder)
+int wxCALLBACK wxFileDataTimeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)
{
wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
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;
wxStructStat buff;
#if defined(__UNIX__) && (!defined( __OS2__ ) && !defined(__VMS))
- lstat( m_filePath.fn_str(), &buff );
- m_type |= S_ISLNK(buff.st_mode) ? is_link : 0;
+ const bool hasStat = lstat( m_filePath.fn_str(), &buff ) == 0;
+ if ( hasStat )
+ m_type |= S_ISLNK(buff.st_mode) ? is_link : 0;
#else // no lstat()
- // only translate to file charset if we don't go by our
- // wxStat implementation
-#ifndef wxNEED_WX_UNISTD_H
- wxStat( m_filePath.fn_str() , &buff );
-#else
- wxStat( m_filePath, &buff );
-#endif
+ const bool hasStat = wxStat( m_filePath, &buff ) == 0;
#endif
- m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0;
- m_type |= (buff.st_mode & wxS_IXUSR) != 0 ? is_exe : 0;
+ if ( hasStat )
+ {
+ m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0;
+ m_type |= (buff.st_mode & wxS_IXUSR) != 0 ? is_exe : 0;
- m_size = buff.st_size;
+ m_size = buff.st_size;
- m_dateTime = buff.st_mtime;
+ m_dateTime = buff.st_mtime;
+ }
#endif
// __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('-'));
+ if ( hasStat )
+ {
+ 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
#endif // defined(__UNIX__) || defined(__WIN32__)
default:
- wxFAIL_MSG( _T("unexpected field in wxFileData::GetEntry()") );
+ wxFAIL_MSG( wxT("unexpected field in wxFileData::GetEntry()") );
}
return s;
if (IsLink())
{
- wxColour dg = wxTheColourDatabase->Find( _T("MEDIUM GREY") );
- if ( dg.Ok() )
+ wxColour dg = wxTheColourDatabase->Find( wxT("MEDIUM GREY") );
+ if ( dg.IsOk() )
item.SetTextColour(dg);
}
item.m_data = wxPtrToUInt(this);
wxListItem item;
item.m_itemId = 0;
item.m_col = 0;
- long id = Add( fd, item );
+ long itemid = Add( fd, item );
- if (id != -1)
+ if (itemid != -1)
{
SortItems(m_sort_field, m_sort_forward);
- id = FindItem( 0, wxPtrToUInt(fd) );
- EnsureVisible( id );
- EditLabel( id );
+ itemid = FindItem( 0, wxPtrToUInt(fd) );
+ EnsureVisible( itemid );
+ EditLabel( itemid );
}
else
delete fd;
// wxGenericFileCtrl implementation
///////////////////////////////////////////////////////////////////////////////
-IMPLEMENT_DYNAMIC_CLASS( wxGenericFileCtrl, wxPanel )
+IMPLEMENT_DYNAMIC_CLASS( wxGenericFileCtrl, wxNavigationEnabled<wxControl> )
-BEGIN_EVENT_TABLE( wxGenericFileCtrl, wxPanel )
+BEGIN_EVENT_TABLE( wxGenericFileCtrl, wxNavigationEnabled<wxControl> )
EVT_LIST_ITEM_SELECTED( ID_FILELIST_CTRL, wxGenericFileCtrl::OnSelected )
EVT_LIST_ITEM_ACTIVATED( ID_FILELIST_CTRL, wxGenericFileCtrl::OnActivated )
EVT_CHOICE( ID_CHOICE, wxGenericFileCtrl::OnChoiceFilter )
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 ) ),
wxASSERT_MSG( !( ( m_style & wxFC_SAVE ) && ( m_style & wxFC_MULTIPLE ) ),
wxT( "wxFC_MULTIPLE can't be used with wxFC_SAVE" ) );
- wxPanel::Create( parent, id, pos, size, wxTAB_TRAVERSAL, name );
+ wxNavigationEnabled<wxControl>::Create( parent, id,
+ pos, size,
+ wxTAB_TRAVERSAL,
+ wxDefaultValidator,
+ name );
m_dir = defaultDirectory;
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 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)
+{
+ return fullPath ? fn.GetFullPath() : fn.GetFullName();
+}
+
+void
+wxGenericFileCtrl::DoGetFilenames(wxArrayString& filenames, bool fullPath) const
{
filenames.clear();
if ( fn.IsRelative() )
fn.MakeAbsolute(dir);
- filenames.push_back(fullPath ? fn.GetFullPath() : fn.GetFullName());
+ filenames.push_back(GetFileNameOrPath(fn, fullPath));
return;
}
m_list->GetItem(item);
const wxFileName fn(dir, item.m_text);
- filenames.push_back(fullPath ? fn.GetFullPath() : fn.GetFullName());
+ filenames.push_back(GetFileNameOrPath(fn, fullPath));
}
}
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( "*." ) )
{
m_filterExtension = str.Mid( 1 );
- if ( m_filterExtension == _T( ".*" ) )
+ if ( m_filterExtension == wxT( ".*" ) )
m_filterExtension.clear();
}
else
{
m_filterExtension.clear();
}
+
+ GenerateFilterChangedEvent( this, this );
}
void wxGenericFileCtrl::SetWildcard( const wxString& wildCard )
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( "." );
projects / wxWidgets.git / blobdiff