{
wxFileData *fd1 = (wxFileData*)data1 ;
wxFileData *fd2 = (wxFileData*)data2 ;
- if (fd1->GetName() == _T("..")) return -1;
- if (fd2->GetName() == _T("..")) return 1;
+ if (fd1->GetName() == wxT("..")) return -1;
+ if (fd2->GetName() == wxT("..")) return 1;
if (fd1->IsDir() && !fd2->IsDir()) return -1;
if (fd2->IsDir() && !fd1->IsDir()) return 1;
- return strcmp( fd1->GetName(), fd2->GetName() );
+ return wxStrcmp( fd1->GetName(), fd2->GetName() );
}
//-----------------------------------------------------------------------------
m_fileName = fname;
struct stat buff;
- stat( m_fileName.GetData(), &buff );
+ stat( m_fileName.fn_str(), &buff );
+
+#ifndef __EMX__
struct stat lbuff;
- lstat( m_fileName.GetData(), &lbuff );
-
+ lstat( m_fileName.fn_str(), &lbuff );
+ m_isLink = S_ISLNK( lbuff.st_mode );
struct tm *t = localtime( &lbuff.st_mtime );
+#else
+ m_isLink = FALSE;
+ struct tm *t = localtime( &buff.st_mtime );
+#endif
+
// struct passwd *user = getpwuid( buff.st_uid );
// struct group *grp = getgrgid( buff.st_gid );
m_isDir = S_ISDIR( buff.st_mode );
- m_isLink = S_ISLNK( lbuff.st_mode );
m_isExe = ((buff.st_mode & S_IXUSR ) == S_IXUSR );
m_size = buff.st_size;
m_month = t->tm_mon+1;
m_day = t->tm_mday;
m_year = t->tm_year;
+ m_year += 1900;
- m_permissions.sprintf( "%c%c%c",
- ((( buff.st_mode & S_IRUSR ) == S_IRUSR ) ? 'r' : '-'),
- ((( buff.st_mode & S_IWUSR ) == S_IWUSR ) ? 'w' : '-'),
- ((( buff.st_mode & S_IXUSR ) == S_IXUSR ) ? 'x' : '-') );
+ m_permissions.sprintf( wxT("%c%c%c"),
+ ((( buff.st_mode & S_IRUSR ) == S_IRUSR ) ? wxT('r') : wxT('-')),
+ ((( buff.st_mode & S_IWUSR ) == S_IWUSR ) ? wxT('w') : wxT('-')),
+ ((( buff.st_mode & S_IXUSR ) == S_IXUSR ) ? wxT('x') : wxT('-')) );
}
wxString wxFileData::GetName() const
s += _(" bytes ");
}
s += IntToString( m_day );
- s += _T(".");
+ s += wxT(".");
s += IntToString( m_month );
- s += _T(".");
+ s += wxT(".");
s += IntToString( m_year );
- s += _T(" ");
+ s += wxT(" ");
s += IntToString( m_hour );
- s += _T(":");
+ s += wxT(":");
s += IntToString( m_minute );
- s += _T(" ");
+ s += wxT(" ");
s += m_permissions;
return s;
};
switch (num)
{
case 0:
+ {
s = m_name;
- break;
+ }
+ break;
case 1:
+ {
if (m_isDir) s = _("<DIR>");
else if (m_isLink) s = _("<LINK>");
else s = LongToString( m_size );
- break;
+ }
+ break;
case 2:
- if (m_day < 10) s = _T("0"); else s = _T("");
+ {
+ if (m_day < 10) s = wxT("0"); else s = wxT("");
s += IntToString( m_day );
- s += _T(".");
- if (m_month < 10) s += _T("0");
+ s += wxT(".");
+ if (m_month < 10) s += wxT("0");
s += IntToString( m_month );
- s += _T(".");
- if (m_year < 10) s += _T("0"); // this should happen real soon...
+ s += wxT(".");
s += IntToString( m_year );
- break;
+ }
+ break;
case 3:
- if (m_hour < 10) s = _T("0"); else s = _T("");
+ {
+ if (m_hour < 10) s = wxT("0"); else s = wxT("");
s += IntToString( m_hour );
- s += _T(":");
- if (m_minute < 10) s += _T("0");
+ s += wxT(":");
+ if (m_minute < 10) s += wxT("0");
s += IntToString( m_minute );
break;
+ }
case 4:
s = m_permissions;
break;
default:
- s = _T("No entry");
+ s = wxT("No entry");
break;
}
return s;
void wxFileData::MakeItem( wxListItem &item )
{
item.m_text = m_name;
- item.m_colour = wxBLACK;
- if (IsExe()) item.m_colour = wxRED;
- if (IsDir()) item.m_colour = wxBLUE;
- if (IsDir()) item.m_image = 0; else item.m_image = -1;
+ item.ClearAttributes();
+ if (IsExe()) item.SetTextColour(*wxRED);
+ if (IsDir()) item.SetTextColour(*wxBLUE);
+ item.m_image = IsDir() ? 0 : -1;
if (IsLink())
{
wxColour *dg = wxTheColourDatabase->FindColour( "MEDIUM GREY" );
- item.m_colour = dg;
+ item.SetTextColour(*dg);
}
item.m_data = (long)this;
}
wxFileCtrl::wxFileCtrl()
{
- m_dirName = _T("/");
+ m_dirName = wxT("/");
m_showHidden = FALSE;
}
{
InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, 130 );
InsertColumn( 1, _("Size"), wxLIST_FORMAT_LEFT, 60 );
- InsertColumn( 2, _("Date"), wxLIST_FORMAT_LEFT, 55 );
+ InsertColumn( 2, _("Date"), wxLIST_FORMAT_LEFT, 70 );
InsertColumn( 3, _("Time"), wxLIST_FORMAT_LEFT, 50 );
InsertColumn( 4, _("Permissions"), wxLIST_FORMAT_LEFT, 120 );
}
item.m_itemId = 0;
item.m_col = 0;
- if (m_dirName != _T("/"))
+ if (m_dirName != wxT("/"))
{
wxString p( wxPathOnly(m_dirName) );
- if (p.IsEmpty()) p = _T("/");
- fd = new wxFileData( _T(".."), p );
+ if (p.IsEmpty()) p = wxT("/");
+ fd = new wxFileData( wxT(".."), p );
Add( fd, item );
item.m_itemId++;
}
- wxString res = m_dirName + _T("/*");
+ wxString res = m_dirName + wxT("/*");
wxString f( wxFindFirstFile( res.GetData(), wxDIR ) );
while (!f.IsEmpty())
{
res = wxFileNameFromPath( f );
fd = new wxFileData( res, f );
wxString s = fd->GetName();
- if (m_showHidden || (s[0] != _T('.')))
+ if (m_showHidden || (s[0] != wxT('.')))
{
Add( fd, item );
item.m_itemId++;
f = wxFindNextFile();
}
- res = m_dirName + _T("/") + m_wild;
+ res = m_dirName + wxT("/") + m_wild;
f = wxFindFirstFile( res.GetData(), wxFILE );
while (!f.IsEmpty())
{
res = wxFileNameFromPath( f );
fd = new wxFileData( res, f );
wxString s = fd->GetName();
- if (m_showHidden || (s[0] != _T('.')))
+ if (m_showHidden || (s[0] != wxT('.')))
{
Add( fd, item );
item.m_itemId++;
}
SortItems( ListCompare, 0 );
+
+ SetColumnWidth( 2, wxLIST_AUTOSIZE );
+ SetColumnWidth( 3, wxLIST_AUTOSIZE );
+ SetColumnWidth( 4, wxLIST_AUTOSIZE );
}
void wxFileCtrl::SetWild( const wxString &wild )
void wxFileCtrl::MakeDir()
{
- wxString new_name( _T("NewName") );
+ wxString new_name( wxT("NewName") );
wxString path( m_dirName );
- path += _T( "/" );
+ path += wxT("/");
path += new_name;
if (wxFileExists(path))
{
do {
new_name = _("NewName");
wxString num;
- num.Printf( _T("%d"), i );
+ num.Printf( wxT("%d"), i );
new_name += num;
path = m_dirName;
- path += _T("/");
+ path += wxT("/");
path += new_name;
i++;
} while (wxFileExists(path));
wxListItem item;
item.m_itemId = 0;
item.m_col = 0;
- int id = Add( fd, item );
+ long id = Add( fd, item );
if (id != -1)
{
void wxFileCtrl::GoToParentDir()
{
- if (m_dirName != _T("/"))
+ if (m_dirName != wxT("/"))
{
wxString fname( wxFileNameFromPath(m_dirName) );
m_dirName = wxPathOnly( m_dirName );
- if (m_dirName.IsEmpty()) m_dirName = _T("/");
+ if (m_dirName.IsEmpty()) m_dirName = wxT("/");
Update();
- int id = FindItem( 0, fname );
+ long id = FindItem( 0, fname );
if (id != -1)
{
SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
if ((event.GetLabel().IsEmpty()) ||
(event.GetLabel() == _(".")) ||
(event.GetLabel() == _("..")) ||
- (event.GetLabel().First( _T("/") ) != wxNOT_FOUND))
+ (event.GetLabel().First( wxT("/") ) != wxNOT_FOUND))
{
wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR );
dialog.ShowModal();
}
wxString new_name( wxPathOnly( fd->GetFullName() ) );
- new_name += _T("/");
+ new_name += wxT("/");
new_name += event.GetLabel();
wxLogNull log;
#define ID_TEXT wxID_FILEDLGG + 9
#define ID_LIST_CTRL wxID_FILEDLGG + 10
#define ID_ACTIVATED wxID_FILEDLGG + 11
+#define ID_CHECK wxID_FILEDLGG + 12
IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
EVT_LIST_ITEM_ACTIVATED(ID_LIST_CTRL, wxFileDialog::OnActivated)
EVT_CHOICE(ID_CHOICE,wxFileDialog::OnChoice)
EVT_TEXT_ENTER(ID_TEXT,wxFileDialog::OnTextEnter)
+ EVT_CHECKBOX(ID_CHECK,wxFileDialog::OnCheck)
END_EVENT_TABLE()
wxFileDialog::wxFileDialog(wxWindow *parent,
m_message = message;
m_dialogStyle = style;
+
+ if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN))
+ m_dialogStyle |= wxOPEN;
+
m_dir = defaultDir;
- if (m_dir.IsEmpty())
+ if ((m_dir.IsEmpty()) || (m_dir == wxT(".")))
{
char buf[200];
m_dir = getcwd( buf, sizeof(buf) );
}
m_path = defaultDir;
- m_path += _T("/");
+ m_path += wxT("/");
m_path += defaultFile;
m_fileName = defaultFile;
m_wildCard = wildCard;
if (m_wildCard.IsEmpty())
m_wildCard = _("All files (*)|*");
- wxStringTokenizer tokens( m_wildCard, _T("|") );
+ wxStringTokenizer tokens( m_wildCard, wxT("|") );
wxString firstWild;
wxString firstWildText;
if (tokens.CountTokens() == 1)
}
else
{
- wxASSERT_MSG( tokens.CountTokens() % 2 == 0, _T("Wrong file type descripition") );
+ wxASSERT_MSG( tokens.CountTokens() % 2 == 0, wxT("Wrong file type descripition") );
firstWildText = tokens.GetNextToken();
firstWild = tokens.GetNextToken();
}
staticsizer->Add( m_static, 1 );
mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
- m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition, wxSize(440,180),
- wxLC_LIST | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
+ if (m_dialogStyle & wxMULTIPLE)
+ m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
+ wxSize(440,180), wxLC_LIST | wxSUNKEN_BORDER );
+ else
+ m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
+ wxSize(440,180), wxLC_LIST | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );
m_choice = new wxChoice( this, ID_CHOICE );
choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 10 );
+ m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
+ m_check->SetValue( FALSE );
+ choicesizer->Add( m_check, 0, wxCENTER|wxALL, 10 );
choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
mainsizer->Add( choicesizer, 0, wxEXPAND );
void wxFileDialog::OnChoice( wxCommandEvent &event )
{
- wxString *str = (wxString*) m_choice->GetClientData( event.GetInt() );
+ int index = (int)event.GetInt();
+ wxString *str = (wxString*) m_choice->GetClientData( index );
m_list->SetWild( *str );
+ m_filterIndex = index;
+}
+
+void wxFileDialog::OnCheck( wxCommandEvent &event )
+{
+ m_list->ShowHidden( event.GetInt() );
}
void wxFileDialog::OnActivated( wxListEvent &event )
if (FindFocus() != m_list) return;
wxString filename( event.m_item.m_text );
- if (filename == _T("..")) return;
+ if (filename == wxT("..")) return;
wxString dir;
m_list->GetDir( dir );
- if (dir != _T("/")) dir += _T("/");
+ if (dir != wxT("/")) dir += wxT("/");
dir += filename;
if (wxDirExists(dir)) return;
wxString dir;
m_list->GetDir( dir );
if (filename.IsEmpty()) return;
- if (filename == _T(".")) return;
+ if (filename == wxT(".")) return;
- if (filename == _T(".."))
+ if (filename == wxT(".."))
{
m_list->GoToParentDir();
m_list->SetFocus();
return;
}
- if (filename == _T("~"))
+ if (filename == wxT("~"))
{
m_list->GoToHomeDir();
m_list->SetFocus();
return;
}
- if (filename[0] == _T('~'))
+ if (filename[0] == wxT('~'))
{
filename.Remove( 0, 1 );
wxString tmp( wxGetUserHome() );
- tmp += _T('/');
+ tmp += wxT('/');
tmp += filename;
filename = tmp;
}
- if ((filename.Find(_T('*')) != wxNOT_FOUND) ||
- (filename.Find(_T('?')) != wxNOT_FOUND))
+ if ((filename.Find(wxT('*')) != wxNOT_FOUND) ||
+ (filename.Find(wxT('?')) != wxNOT_FOUND))
{
- if (filename.Find(_T('/')) != wxNOT_FOUND)
+ if (filename.Find(wxT('/')) != wxNOT_FOUND)
{
wxMessageBox(_("Illegal file specification."), _("Error"), wxOK | wxICON_ERROR );
return;
return;
}
- if (dir != _T("/")) dir += _T("/");
- if (filename[0] != _T('/'))
+ if (dir != wxT("/")) dir += wxT("/");
+ if (filename[0] != wxT('/'))
{
dir += filename;
filename = dir;
}
SetPath( filename );
+
+ wxCommandEvent event;
+ wxDialog::OnOK(event);
}
-void wxFileDialog::OnListOk( wxCommandEvent &event )
+void wxFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) )
{
HandleAction( m_text->GetValue() );
- event.Skip();
}
void wxFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )
wxSplitPath(path, &m_dir, &m_fileName, &ext);
if (!ext.IsEmpty())
{
- m_fileName += _T(".");
+ m_fileName += wxT(".");
m_fileName += ext;
}
}
}
+void wxFileDialog::GetPaths( wxArrayString& paths ) const
+{
+ paths.Empty();
+ if (m_list->GetSelectedItemCount() == 0)
+ {
+ paths.Add( GetPath() );
+ return;
+ }
+
+ paths.Alloc( m_list->GetSelectedItemCount() );
+
+ wxString dir;
+ m_list->GetDir( dir );
+ if (dir != wxT("/")) dir += wxT("/");
+
+ 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 ) {
+ m_list->GetItem( item );
+ paths.Add( dir + item.m_text );
+ item.m_itemId = m_list->GetNextItem( item.m_itemId + 1,
+ wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+ }
+}
+
+void wxFileDialog::GetFilenames(wxArrayString& files) const
+{
+ files.Empty();
+ if (m_list->GetSelectedItemCount() == 0)
+ {
+ files.Add( GetFilename() );
+ return;
+ }
+ files.Alloc( m_list->GetSelectedItemCount() );
+
+ 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 ) {
+ m_list->GetItem( item );
+ files.Add( item.m_text );
+ item.m_itemId = m_list->GetNextItem( item.m_itemId + 1,
+ wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+ }
+}
+
// ----------------------------------------------------------------------------
// global functions
// ----------------------------------------------------------------------------
wxFileSelectorEx(const wxChar *message,
const wxChar *default_path,
const wxChar *default_filename,
- int *indexDefaultExtension,
+ int *WXUNUSED(indexDefaultExtension),
const wxChar *wildcard,
int flags,
wxWindow *parent,
int x, int y)
{
// TODO: implement this somehow
- return wxFileSelector(message, default_path, default_filename, _T(""),
+ return wxFileSelector(message, default_path, default_filename, wxT(""),
wildcard, flags, parent, x, y);
}
{
wxString filter2;
if ( defaultExtension && !filter )
- filter2 = wxString(_T("*.")) + wxString(defaultExtension) ;
+ filter2 = wxString(wxT("*.")) + wxString(defaultExtension) ;
else if ( filter )
filter2 = filter;
wxString str = _("Load %s file");
wxSprintf(prompt, str, what);
- if (*ext == _T('.')) ext++;
+ if (*ext == wxT('.')) ext++;
wxChar wild[60];
- wxSprintf(wild, _T("*.%s"), ext);
+ wxSprintf(wild, wxT("*.%s"), ext);
return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
}
wxString str = _("Save %s file");
wxSprintf(prompt, str, what);
- if (*ext == _T('.')) ext++;
+ if (*ext == wxT('.')) ext++;
wxChar wild[60];
- wxSprintf(wild, _T("*.%s"), ext);
+ wxSprintf(wild, wxT("*.%s"), ext);
return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
}
projects / wxWidgets.git / blobdiff