X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..2b8f5a2488b051daf6f9c0d161e57e0d1dabeab0:/src/generic/filedlgg.cpp diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index 265e8cb39e..c76bb9c2c6 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -93,7 +93,7 @@ int ListCompare( long data1, long data2, long WXUNUSED(data) ) 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() ); } //----------------------------------------------------------------------------- @@ -108,16 +108,22 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname ) 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; @@ -128,10 +134,10 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname ) m_day = t->tm_mday; m_year = t->tm_year; - 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 @@ -238,14 +244,13 @@ void wxFileData::SetNewName( const wxString &name, const wxString &fname ) 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; + 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; } @@ -537,6 +542,7 @@ void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event ) #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) @@ -551,6 +557,7 @@ BEGIN_EVENT_TABLE(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, @@ -566,6 +573,10 @@ wxFileDialog::wxFileDialog(wxWindow *parent, m_message = message; m_dialogStyle = style; + + if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN)) + m_dialogStyle &= ~wxMULTIPLE; + m_dir = defaultDir; if (m_dir.IsEmpty()) { @@ -649,8 +660,12 @@ wxFileDialog::wxFileDialog(wxWindow *parent, 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 ); @@ -662,6 +677,9 @@ wxFileDialog::wxFileDialog(wxWindow *parent, 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 ); @@ -698,6 +716,12 @@ void wxFileDialog::OnChoice( wxCommandEvent &event ) { wxString *str = (wxString*) m_choice->GetClientData( event.GetInt() ); m_list->SetWild( *str ); + m_filterIndex = event.GetInt(); +} + +void wxFileDialog::OnCheck( wxCommandEvent &event ) +{ + m_list->ShowHidden( event.GetInt() ); } void wxFileDialog::OnActivated( wxListEvent &event ) @@ -873,6 +897,44 @@ void wxFileDialog::SetPath( const wxString& path ) } } +void wxFileDialog::GetPaths( wxArrayString& paths ) const +{ + paths.Empty(); + 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(); + 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 // ----------------------------------------------------------------------------