X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9e3ce8f5a02a03ef5224938ec94e6a123ca6748..72045d5768a126191a907bc640c28e81a11afdd6:/src/generic/filedlgg.cpp?ds=sidebyside diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index 41dc1131ed..5264d09285 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -1,5 +1,5 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: filedlgg.cpp +////////////////////////////////////////////////////////////////////////////// +// Name: src/generic/filedlgg.cpp // Purpose: wxGenericFileDialog // Author: Robert Roebling // Modified by: @@ -9,42 +9,46 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "filedlgg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_FILEDLG // NOTE : it probably also supports MAC, untested -#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) +#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__) #error wxGenericFileDialog currently only supports Unix, win32 and DOS #endif -#include "wx/checkbox.h" -#include "wx/textctrl.h" -#include "wx/choice.h" -#include "wx/checkbox.h" -#include "wx/stattext.h" -#include "wx/debug.h" -#include "wx/log.h" -#include "wx/intl.h" -#include "wx/msgdlg.h" -#include "wx/sizer.h" -#include "wx/bmpbuttn.h" +#ifndef WX_PRECOMP + #ifdef __WXMSW__ + #include "wx/msw/wrapwin.h" + #endif + #include "wx/hash.h" + #include "wx/intl.h" + #include "wx/settings.h" + #include "wx/log.h" + #include "wx/msgdlg.h" + #include "wx/bmpbuttn.h" + #include "wx/checkbox.h" + #include "wx/choice.h" + #include "wx/stattext.h" + #include "wx/textctrl.h" + #include "wx/sizer.h" + #include "wx/filedlg.h" // wxFD_OPEN, wxFD_SAVE... +#endif + +#include "wx/longlong.h" #include "wx/tokenzr.h" #include "wx/config.h" #include "wx/imaglist.h" #include "wx/dir.h" #include "wx/artprov.h" +#include "wx/filefn.h" #include "wx/file.h" // for wxS_IXXX constants only -#include "wx/filedlg.h" // wxOPEN, wxSAVE... #include "wx/generic/filedlgg.h" #include "wx/generic/dirctrlg.h" // for wxFileIconsTable @@ -52,8 +56,10 @@ #include "wx/tooltip.h" #endif -#include -#include +#ifndef __WXWINCE__ + #include + #include +#endif #ifdef __UNIX__ #include @@ -63,11 +69,18 @@ #endif #endif +#ifdef __WINDOWS__ + #include "wx/msw/mslu.h" +#endif + #ifdef __WATCOMC__ #include #endif +#ifndef __WXWINCE__ #include +#endif + #if defined(__UNIX__) || defined(__DOS__) #include #endif @@ -77,71 +90,93 @@ // ---------------------------------------------------------------------------- static -int wxFileDataNameCompare( long data1, long data2, long data) +int wxCALLBACK wxFileDataNameCompare( long data1, long data2, long sortOrder) { - wxFileData *fd1 = (wxFileData*)data1; - wxFileData *fd2 = (wxFileData*)data2; - if (fd1->GetFileName() == wxT("..")) return -data; - if (fd2->GetFileName() == wxT("..")) return data; - if (fd1->IsDir() && !fd2->IsDir()) return -data; - if (fd2->IsDir() && !fd1->IsDir()) return data; - return data*wxStrcmp( fd1->GetFileName(), fd2->GetFileName() ); + wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); + wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); + + if (fd1->GetFileName() == wxT("..")) + return -sortOrder; + if (fd2->GetFileName() == wxT("..")) + return sortOrder; + if (fd1->IsDir() && !fd2->IsDir()) + return -sortOrder; + if (fd2->IsDir() && !fd1->IsDir()) + return sortOrder; + + return sortOrder*wxStrcmp( fd1->GetFileName(), fd2->GetFileName() ); } static -int wxFileDataSizeCompare( long data1, long data2, long data) +int wxCALLBACK wxFileDataSizeCompare(long data1, long data2, long sortOrder) { - wxFileData *fd1 = (wxFileData*)data1; - wxFileData *fd2 = (wxFileData*)data2; - if (fd1->GetFileName() == wxT("..")) return -data; - if (fd2->GetFileName() == wxT("..")) return data; - if (fd1->IsDir() && !fd2->IsDir()) return -data; - if (fd2->IsDir() && !fd1->IsDir()) return data; - if (fd1->IsLink() && !fd2->IsLink()) return -data; - if (fd2->IsLink() && !fd1->IsLink()) return data; - return data*(fd1->GetSize() - fd2->GetSize()); + wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); + wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); + + if (fd1->GetFileName() == wxT("..")) + return -sortOrder; + if (fd2->GetFileName() == wxT("..")) + return sortOrder; + if (fd1->IsDir() && !fd2->IsDir()) + return -sortOrder; + if (fd2->IsDir() && !fd1->IsDir()) + return sortOrder; + if (fd1->IsLink() && !fd2->IsLink()) + return -sortOrder; + if (fd2->IsLink() && !fd1->IsLink()) + return sortOrder; + + return fd1->GetSize() > fd2->GetSize() ? sortOrder : -sortOrder; } static -int wxFileDataTypeCompare( long data1, long data2, long data) +int wxCALLBACK wxFileDataTypeCompare(long data1, long data2, long sortOrder) { - wxFileData *fd1 = (wxFileData*)data1; - wxFileData *fd2 = (wxFileData*)data2; - if (fd1->GetFileName() == wxT("..")) return -data; - if (fd2->GetFileName() == wxT("..")) return data; - if (fd1->IsDir() && !fd2->IsDir()) return -data; - if (fd2->IsDir() && !fd1->IsDir()) return data; - if (fd1->IsLink() && !fd2->IsLink()) return -data; - if (fd2->IsLink() && !fd1->IsLink()) return data; - return data*wxStrcmp( fd1->GetFileType(), fd2->GetFileType() ); + wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); + wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); + + if (fd1->GetFileName() == wxT("..")) + return -sortOrder; + if (fd2->GetFileName() == wxT("..")) + return sortOrder; + if (fd1->IsDir() && !fd2->IsDir()) + return -sortOrder; + if (fd2->IsDir() && !fd1->IsDir()) + return sortOrder; + if (fd1->IsLink() && !fd2->IsLink()) + return -sortOrder; + if (fd2->IsLink() && !fd1->IsLink()) + return sortOrder; + + return sortOrder*wxStrcmp( fd1->GetFileType(), fd2->GetFileType() ); } static -int wxFileDataTimeCompare( long data1, long data2, long data) +int wxCALLBACK wxFileDataTimeCompare(long data1, long data2, long sortOrder) { - wxFileData *fd1 = (wxFileData*)data1; - wxFileData *fd2 = (wxFileData*)data2; - if (fd1->GetFileName() == wxT("..")) return -data; - if (fd2->GetFileName() == wxT("..")) return data; - if (fd1->IsDir() && !fd2->IsDir()) return -data; - if (fd2->IsDir() && !fd1->IsDir()) return data; - - return fd1->GetDateTime().IsLaterThan(fd2->GetDateTime()) ? int(data) : -int(data); + wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); + wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); + + if (fd1->GetFileName() == wxT("..")) + return -sortOrder; + if (fd2->GetFileName() == wxT("..")) + return sortOrder; + if (fd1->IsDir() && !fd2->IsDir()) + return -sortOrder; + if (fd2->IsDir() && !fd1->IsDir()) + return sortOrder; + + return fd1->GetDateTime().IsLaterThan(fd2->GetDateTime()) ? sortOrder : -sortOrder; } -#ifdef __UNIX__ +#if defined(__WXWINCE__) +#define IsTopMostDir(dir) (dir == wxT("\\") || dir == wxT("/")) +#elif (defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__)) +#define IsTopMostDir(dir) (dir.empty()) +#else #define IsTopMostDir(dir) (dir == wxT("/")) #endif -#if defined(__DOS__) || defined(__WINDOWS__) -#define IsTopMostDir(dir) (dir.IsEmpty()) -#endif - -#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) -// defined in src/generic/dirctrlg.cpp -extern bool wxIsDriveAvailable(const wxString& dirName); -#endif - // defined in src/generic/dirctrlg.cpp extern size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayInt &icon_ids); @@ -149,19 +184,9 @@ extern size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, w // wxFileData //----------------------------------------------------------------------------- -wxFileData::wxFileData( const wxFileData& fileData ) -{ - m_fileName = fileData.GetFileName(); - m_filePath = fileData.GetFilePath(); - m_size = fileData.GetSize(); - m_dateTime = fileData.GetDateTime(); - m_permissions = fileData.GetPermissions(); - m_type = fileData.GetType(); - m_image = GetImageId(); -} - wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, fileType type, int image_id ) { + Init(); m_fileName = fileName; m_filePath = filePath; m_type = type; @@ -170,6 +195,24 @@ wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, file ReadData(); } +void wxFileData::Init() +{ + m_size = 0; + m_type = wxFileData::is_file; + m_image = wxFileIconsTable::file; +} + +void wxFileData::Copy( const wxFileData& fileData ) +{ + m_fileName = fileData.GetFileName(); + m_filePath = fileData.GetFilePath(); + m_size = fileData.GetSize(); + m_dateTime = fileData.GetDateTime(); + m_permissions = fileData.GetPermissions(); + m_type = fileData.GetType(); + m_image = fileData.GetImageId(); +} + void wxFileData::ReadData() { if (IsDrive()) @@ -178,7 +221,7 @@ void wxFileData::ReadData() return; } -#if defined(__DOS__) || defined(__WINDOWS__) +#if defined(__DOS__) || (defined(__WINDOWS__) && !defined(__WXWINCE__)) || defined(__OS2__) // c:\.. is a drive don't stat it if ((m_fileName == wxT("..")) && (m_filePath.length() <= 5)) { @@ -188,30 +231,63 @@ void wxFileData::ReadData() } #endif // __DOS__ || __WINDOWS__ +#ifdef __WXWINCE__ + + // WinCE + + DWORD fileAttribs = GetFileAttributes(m_filePath.fn_str()); + m_type |= (fileAttribs & FILE_ATTRIBUTE_DIRECTORY) != 0 ? is_dir : 0; + + wxString p, f, ext; + wxSplitPath(m_filePath, & p, & f, & ext); + if (wxStricmp(ext, wxT("exe")) == 0) + m_type |= is_exe; + + // Find out size + m_size = 0; + HANDLE fileHandle = CreateFile(m_filePath.fn_str(), + GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + + if (fileHandle != INVALID_HANDLE_VALUE) + { + m_size = GetFileSize(fileHandle, 0); + CloseHandle(fileHandle); + } + + m_dateTime = wxFileModificationTime(m_filePath); + +#else + + // OTHER PLATFORMS + wxStructStat buff; -#if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS)) +#if defined(__UNIX__) && (!defined( __OS2__ ) && !defined(__VMS)) lstat( m_filePath.fn_str(), &buff ); m_type |= S_ISLNK( buff.st_mode ) != 0 ? 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 #endif m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0; m_type |= (buff.st_mode & wxS_IXUSR) != 0 ? is_exe : 0; - // try to get a better icon - if (m_image == wxFileIconsTable::file) - { - if (IsExe()) - m_image = wxFileIconsTable::executable; - else if (m_fileName.Find(wxT('.'), TRUE) != wxNOT_FOUND) - m_image = wxTheFileIconsTable->GetIconID(m_fileName.AfterLast(wxT('.'))); - } - m_size = buff.st_size; m_dateTime = buff.st_mtime; +#endif + // __WXWINCE__ #if defined(__UNIX__) m_permissions.Printf(_T("%c%c%c%c%c%c%c%c%c"), @@ -225,7 +301,7 @@ void wxFileData::ReadData() buff.st_mode & wxS_IWOTH ? _T('w') : _T('-'), buff.st_mode & wxS_IXOTH ? _T('x') : _T('-')); #elif defined(__WIN32__) - DWORD attribs = GetFileAttributes(m_filePath); + DWORD attribs = ::GetFileAttributes(m_filePath.c_str()); if (attribs != (DWORD)-1) { m_permissions.Printf(_T("%c%c%c%c"), @@ -235,6 +311,18 @@ void wxFileData::ReadData() attribs & FILE_ATTRIBUTE_SYSTEM ? _T('S') : _T(' ')); } #endif + + // try to get a better icon + if (m_image == wxFileIconsTable::file) + { + if (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND) + { + m_image = wxTheFileIconsTable->GetIconID( m_fileName.AfterLast(wxT('.'))); + } else if (IsExe()) + { + m_image = wxFileIconsTable::executable; + } + } } wxString wxFileData::GetFileType() const @@ -245,7 +333,7 @@ wxString wxFileData::GetFileType() const return _(""); else if (IsDrive()) return _(""); - else if (m_fileName.Find(wxT('.'), TRUE) != wxNOT_FOUND) + else if (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND) return m_fileName.AfterLast(wxT('.')); return wxEmptyString; @@ -269,7 +357,8 @@ wxString wxFileData::GetHint() const else if (IsDrive()) s += _(""); else // plain file - s += wxString::Format( _("%ld bytes"), m_size ); + s += wxString::Format(wxPLURAL("%ld byte", "%ld bytes", m_size), + wxLongLong(m_size).ToString().c_str()); s += wxT(' '); @@ -281,7 +370,7 @@ wxString wxFileData::GetHint() const } return s; -}; +} wxString wxFileData::GetEntry( fileListFieldType num ) const { @@ -294,7 +383,7 @@ wxString wxFileData::GetEntry( fileListFieldType num ) const case FileList_Size: if (!IsDir() && !IsLink() && !IsDrive()) - s.Printf(_T("%ld"), m_size); + s = wxLongLong(m_size).ToString(); break; case FileList_Type: @@ -302,7 +391,7 @@ wxString wxFileData::GetEntry( fileListFieldType num ) const break; case FileList_Time: - if (!IsDrive()) + if (!IsDrive()) s = GetModificationTime(); break; @@ -338,28 +427,32 @@ void wxFileData::MakeItem( wxListItem &item ) if (IsLink()) { - wxColour *dg = wxTheColourDatabase->FindColour( _T("MEDIUM GREY") ); - item.SetTextColour(*dg); + wxColour dg = wxTheColourDatabase->Find( _T("MEDIUM GREY") ); + if ( dg.Ok() ) + item.SetTextColour(dg); } - item.m_data = (long)this; + item.m_data = wxPtrToUInt(this); } //----------------------------------------------------------------------------- // wxFileCtrl //----------------------------------------------------------------------------- +static bool ignoreChanges = false; + IMPLEMENT_DYNAMIC_CLASS(wxFileCtrl,wxListCtrl) BEGIN_EVENT_TABLE(wxFileCtrl,wxListCtrl) - EVT_LIST_DELETE_ITEM(-1, wxFileCtrl::OnListDeleteItem) - EVT_LIST_END_LABEL_EDIT(-1, wxFileCtrl::OnListEndLabelEdit) - EVT_LIST_COL_CLICK(-1, wxFileCtrl::OnListColClick) + EVT_LIST_DELETE_ITEM(wxID_ANY, wxFileCtrl::OnListDeleteItem) + EVT_LIST_DELETE_ALL_ITEMS(wxID_ANY, wxFileCtrl::OnListDeleteAllItems) + EVT_LIST_END_LABEL_EDIT(wxID_ANY, wxFileCtrl::OnListEndLabelEdit) + EVT_LIST_COL_CLICK(wxID_ANY, wxFileCtrl::OnListColClick) END_EVENT_TABLE() wxFileCtrl::wxFileCtrl() { - m_showHidden = FALSE; + m_showHidden = false; m_sort_foward = 1; m_sort_field = wxFileData::FileList_Name; } @@ -465,7 +558,7 @@ void wxFileCtrl::UpdateItem(const wxListItem &item) fd->ReadData(); SetItemText(item, fd->GetFileName()); - SetItemImage(item, fd->GetImageId(), fd->GetImageId()); + SetItemImage(item, fd->GetImageId()); if (GetWindowStyleFlag() & wxLC_REPORT) { @@ -482,48 +575,55 @@ void wxFileCtrl::UpdateFiles() wxBusyCursor bcur; // this may take a while... - FreeAllItemsData(); DeleteAllItems(); - wxFileData *fd = (wxFileData *) NULL; wxListItem item; item.m_itemId = 0; item.m_col = 0; -#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__WXPM__) +#if (defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__OS2__)) && !defined(__WXWINCE__) if ( IsTopMostDir(m_dirName) ) - { + { wxArrayString names, paths; wxArrayInt icons; size_t n, count = wxGetAvailableDrives(paths, names, icons); for (n=0; nGetFilePath(),new_name)) { 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() ); } @@ -758,40 +886,38 @@ void wxFileCtrl::OnListColClick( wxListEvent &event ) SortItems(m_sort_field, m_sort_foward); } -void wxFileCtrl::SortItems(wxFileData::fileListFieldType field, bool foward) +void wxFileCtrl::SortItems(wxFileData::fileListFieldType field, bool forward) { m_sort_field = field; - m_sort_foward = foward; - long sort_dir = foward ? 1 : -1; + m_sort_foward = forward; + const long sort_dir = forward ? 1 : -1; switch (m_sort_field) { - case wxFileData::FileList_Name : - { - wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataNameCompare, sort_dir); - break; - } case wxFileData::FileList_Size : - { - wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataSizeCompare, sort_dir); + wxListCtrl::SortItems(wxFileDataSizeCompare, sort_dir); break; - } + case wxFileData::FileList_Type : - { - wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataTypeCompare, sort_dir); - break; - } + wxListCtrl::SortItems(wxFileDataTypeCompare, sort_dir); + break; + case wxFileData::FileList_Time : - { - wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataTimeCompare, sort_dir); - break; - } - default : break; + wxListCtrl::SortItems(wxFileDataTimeCompare, sort_dir); + break; + + case wxFileData::FileList_Name : + default : + wxListCtrl::SortItems(wxFileDataNameCompare, sort_dir); + break; } } wxFileCtrl::~wxFileCtrl() { + // Normally the data are freed via an EVT_LIST_DELETE_ALL_ITEMS event and + // wxFileCtrl::OnListDeleteAllItems. But if the event is generated after + // the destruction of the wxFileCtrl we need to free any data here: FreeAllItemsData(); } @@ -807,7 +933,6 @@ wxFileCtrl::~wxFileCtrl() #define ID_CHOICE (wxID_FILEDLGG + 8) #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(wxGenericFileDialog, wxFileDialogBase) @@ -828,21 +953,68 @@ BEGIN_EVENT_TABLE(wxGenericFileDialog,wxDialog) END_EVENT_TABLE() long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST; -bool wxGenericFileDialog::ms_lastShowHidden = FALSE; +bool wxGenericFileDialog::ms_lastShowHidden = false; + +void wxGenericFileDialog::Init() +{ + m_bypassGenericImpl = false; + + m_choice = NULL; + m_text = NULL; + m_list = NULL; + m_check = NULL; + m_static = NULL; + m_upDirButton = NULL; + m_newDirButton = NULL; +} wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, const wxString& message, const wxString& defaultDir, const wxString& defaultFile, const wxString& wildCard, - long style, - const wxPoint& pos ) - :wxFileDialogBase(parent, message, defaultDir, defaultFile, wildCard, style, pos) + long style, + const wxPoint& pos, + const wxSize& sz, + const wxString& name, + bool bypassGenericImpl ) : wxFileDialogBase() { - wxDialog::Create( parent, -1, message, pos, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER ); + Init(); + Create( parent, message, defaultDir, defaultFile, wildCard, style, pos, sz, name, bypassGenericImpl ); +} + +bool wxGenericFileDialog::Create( wxWindow *parent, + const wxString& message, + const wxString& defaultDir, + const wxString& defaultFile, + const wxString& wildCard, + long style, + const wxPoint& pos, + const wxSize& sz, + const wxString& name, + bool bypassGenericImpl ) +{ + m_bypassGenericImpl = bypassGenericImpl; + + if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFile, + wildCard, style, pos, sz, name)) + { + return false; + } + + if (m_bypassGenericImpl) + return true; + + if (!wxDialog::Create( parent, wxID_ANY, message, pos, sz, + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER, name + )) + { + return false; + } + + ignoreChanges = true; - if (wxConfig::Get(FALSE)) + if (wxConfig::Get(false)) { wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"), &ms_lastViewStyle); @@ -850,17 +1022,14 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, &ms_lastShowHidden); } - if (m_dialogStyle == 0) - m_dialogStyle = wxOPEN; - if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN)) - m_dialogStyle |= wxOPEN; - if ((m_dir.empty()) || (m_dir == wxT("."))) { m_dir = wxGetCwd(); + if (m_dir.empty()) + m_dir = wxFILE_SEP_PATH; } - size_t len = m_dir.Len(); + size_t len = m_dir.length(); if ((len > 1) && (wxEndsWithPathSeparator(m_dir))) m_dir.Remove( len-1, 1 ); @@ -869,13 +1038,6 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, m_path += defaultFile; m_filterExtension = wxEmptyString; - // interpret wildcards - wxArrayString wildDescriptions, wildFilters; - if ( !ParseWildcard(m_wildCard, wildDescriptions, wildFilters) ) - { - wxFAIL_MSG( wxT("Wrong file type description") ); - } - // layout bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); @@ -887,14 +1049,14 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, wxBitmapButton *but; but = new wxBitmapButton(this, ID_LIST_MODE, - wxArtProvider::GetBitmap(wxART_LIST_VIEW, wxART_CMN_DIALOG)); + wxArtProvider::GetBitmap(wxART_LIST_VIEW, wxART_BUTTON)); #if wxUSE_TOOLTIPS but->SetToolTip( _("View files as a list view") ); #endif buttonsizer->Add( but, 0, wxALL, 5 ); but = new wxBitmapButton(this, ID_REPORT_MODE, - wxArtProvider::GetBitmap(wxART_REPORT_VIEW, wxART_CMN_DIALOG)); + wxArtProvider::GetBitmap(wxART_REPORT_VIEW, wxART_BUTTON)); #if wxUSE_TOOLTIPS but->SetToolTip( _("View files as a detailed view") ); #endif @@ -903,7 +1065,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, buttonsizer->Add( 30, 5, 1 ); m_upDirButton = new wxBitmapButton(this, ID_UP_DIR, - wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_CMN_DIALOG)); + wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_BUTTON)); #if wxUSE_TOOLTIPS m_upDirButton->SetToolTip( _("Go to parent directory") ); #endif @@ -911,7 +1073,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, #ifndef __DOS__ // VS: Home directory is meaningless in MS-DOS... but = new wxBitmapButton(this, ID_PARENT_DIR, - wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_CMN_DIALOG)); + wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_BUTTON)); #if wxUSE_TOOLTIPS but->SetToolTip( _("Go to home directory") ); #endif @@ -921,7 +1083,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, #endif //!__DOS__ m_newDirButton = new wxBitmapButton(this, ID_NEW_DIR, - wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG)); + wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_BUTTON)); #if wxUSE_TOOLTIPS m_newDirButton->SetToolTip( _("Create new directory") ); #endif @@ -934,17 +1096,23 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL ); if (is_pda) - staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 ); - m_static = new wxStaticText( this, -1, m_dir ); + staticsizer->Add( new wxStaticText( this, wxID_ANY, _("Current directory:") ), 0, wxRIGHT, 10 ); + m_static = new wxStaticText( this, wxID_ANY, m_dir ); staticsizer->Add( m_static, 1 ); mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 ); - long style2 = ms_lastViewStyle | wxSUNKEN_BORDER; - if ( !(m_dialogStyle & wxMULTIPLE) ) + long style2 = ms_lastViewStyle; + if ( !HasFlag(wxFD_MULTIPLE) ) style2 |= wxLC_SINGLE_SEL; +#ifdef __WXWINCE__ + style2 |= wxSIMPLE_BORDER; +#else + style2 |= wxSUNKEN_BORDER; +#endif + m_list = new wxFileCtrl( this, ID_LIST_CTRL, - wildFilters[0], ms_lastShowHidden, + wxEmptyString, ms_lastShowHidden, wxDefaultPosition, wxSize(540,200), style2); @@ -953,33 +1121,33 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, // PDAs have a different screen layout mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 ); - wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL ); - m_choice = new wxChoice( this, ID_CHOICE ); - choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 5 ); - mainsizer->Add( choicesizer, 0, wxEXPAND ); - wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL ); - m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER ); + m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); textsizer->Add( m_text, 1, wxCENTER | wxALL, 5 ); mainsizer->Add( textsizer, 0, wxEXPAND ); - m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") ); - m_check->SetValue( ms_lastShowHidden ); - textsizer->Add( m_check, 0, wxCENTER|wxALL, 5 ); + m_check = NULL; + m_choice = new wxChoice( this, ID_CHOICE ); + textsizer->Add( m_choice, 1, wxCENTER|wxALL, 5 ); - buttonsizer = new wxBoxSizer( wxHORIZONTAL ); - buttonsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxALL, 5 ); - buttonsizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 5 ); - mainsizer->Add( buttonsizer, 0, wxALIGN_RIGHT ); + wxSizer *bsizer = CreateButtonSizer( wxOK|wxCANCEL , false, 5 ); + if(bsizer->GetChildren().GetCount() > 0 ) + { + mainsizer->Add( bsizer, 0, wxEXPAND | wxALL, 5 ); + } + else + { + delete bsizer; + } } else { mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 ); wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL ); - m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER ); + m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); textsizer->Add( m_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 ); - textsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 ); + textsizer->Add( new wxButton( this, wxID_OK ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 ); mainsizer->Add( textsizer, 0, wxEXPAND ); wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL ); @@ -988,53 +1156,80 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") ); m_check->SetValue( ms_lastShowHidden ); choicesizer->Add( m_check, 0, wxCENTER|wxALL, 10 ); - choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 ); + choicesizer->Add( new wxButton( this, wxID_CANCEL ), 0, wxCENTER | wxALL, 10 ); mainsizer->Add( choicesizer, 0, wxEXPAND ); } - for (size_t n=0; nAppend( wildDescriptions[n], (void*) new wxString( wildFilters[n] ) ); - } - SetFilterIndex( 0 ); + SetWildcard(wildCard); - SetAutoLayout( TRUE ); + SetAutoLayout( true ); SetSizer( mainsizer ); - mainsizer->Fit( this ); - mainsizer->SetSizeHints( this ); + if (!is_pda) + { + mainsizer->Fit( this ); + mainsizer->SetSizeHints( this ); - Centre( wxBOTH ); + Centre( wxBOTH ); + } m_text->SetFocus(); + + ignoreChanges = false; + + return true; } wxGenericFileDialog::~wxGenericFileDialog() { - if (wxConfig::Get(FALSE)) - { - wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"), - ms_lastViewStyle); - wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"), - ms_lastShowHidden); - } + ignoreChanges = true; - const int count = m_choice->GetCount(); - for ( int i = 0; i < count; i++ ) + if (!m_bypassGenericImpl) { - delete (wxString *)m_choice->GetClientData(i); + if (wxConfig::Get(false)) + { + wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"), + ms_lastViewStyle); + wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"), + ms_lastShowHidden); + } + + const int count = m_choice->GetCount(); + for ( int i = 0; i < count; i++ ) + { + delete (wxString *)m_choice->GetClientData(i); + } } } int wxGenericFileDialog::ShowModal() { + ignoreChanges = true; + m_list->GoToDir(m_dir); UpdateControls(); m_text->SetValue(m_fileName); + ignoreChanges = false; + return wxDialog::ShowModal(); } +bool wxGenericFileDialog::Show( bool show ) +{ + // Called by ShowModal, so don't repeate the update +#ifndef __WIN32__ + if (show) + { + m_list->GoToDir(m_dir); + UpdateControls(); + m_text->SetValue(m_fileName); + } +#endif + + return wxDialog::Show( show ); +} + void wxGenericFileDialog::DoSetFilterIndex(int filterindex) { wxString *str = (wxString*) m_choice->GetClientData( filterindex ); @@ -1052,6 +1247,31 @@ void wxGenericFileDialog::DoSetFilterIndex(int filterindex) } } +void wxGenericFileDialog::SetWildcard(const wxString& wildCard) +{ + wxFileDialogBase::SetWildcard(wildCard); + + wxArrayString wildDescriptions, wildFilters; + const size_t count = wxParseCommonDialogsFilter(m_wildCard, + wildDescriptions, + wildFilters); + wxCHECK_RET( count, wxT("wxFileDialog: bad wildcard string") ); + + const size_t countOld = m_choice->GetCount(); + size_t n; + for ( n = 0; n < countOld; n++ ) + { + delete (wxString *)m_choice->GetClientData(n); + } + + for ( n = 0; n < count; n++ ) + { + m_choice->Append( wildDescriptions[n], new wxString( wildFilters[n] ) ); + } + + SetFilterIndex( 0 ); +} + void wxGenericFileDialog::SetFilterIndex( int filterindex ) { m_choice->SetSelection( filterindex ); @@ -1076,13 +1296,9 @@ void wxGenericFileDialog::OnActivated( wxListEvent &event ) void wxGenericFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) ) { - wxCommandEvent cevent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK); - cevent.SetEventObject( this ); - GetEventHandler()->ProcessEvent( cevent ); + HandleAction( m_text->GetValue() ); } -static bool ignoreChanges = FALSE; - void wxGenericFileDialog::OnTextChange( wxCommandEvent &WXUNUSED(event) ) { if (!ignoreChanges) @@ -1104,27 +1320,58 @@ void wxGenericFileDialog::OnTextChange( wxCommandEvent &WXUNUSED(event) ) void wxGenericFileDialog::OnSelected( wxListEvent &event ) { + static bool inSelected = false; + + if (inSelected) + return; + + inSelected = true; wxString filename( event.m_item.m_text ); - if (filename == wxT("..")) return; + +#ifdef __WXWINCE__ + // No double-click on most WinCE devices, so do action immediately. + HandleAction( filename ); +#else + if (filename == wxT("..")) + { + inSelected = false; + return; + } wxString dir = m_list->GetDir(); if (!IsTopMostDir(dir)) dir += wxFILE_SEP_PATH; dir += filename; - if (wxDirExists(dir)) return; + if (wxDirExists(dir)) + { + inSelected = false; + return; + } - ignoreChanges = TRUE; + ignoreChanges = true; m_text->SetValue( filename ); - ignoreChanges = FALSE; + ignoreChanges = false; +#endif + inSelected = false; } void wxGenericFileDialog::HandleAction( const wxString &fn ) { + if (ignoreChanges) + return; + wxString filename( fn ); - wxString dir = m_list->GetDir(); - if (filename.IsEmpty()) return; + if (filename.empty()) + { +#ifdef __WXWINCE__ + EndModal(wxID_CANCEL); +#endif + return; + } if (filename == wxT(".")) return; + wxString dir = m_list->GetDir(); + // "some/place/" means they want to chdir not try to load "place" bool want_dir = filename.Last() == wxFILE_SEP_PATH; if (want_dir) @@ -1132,37 +1379,44 @@ void wxGenericFileDialog::HandleAction( const wxString &fn ) if (filename == wxT("..")) { + ignoreChanges = true; m_list->GoToParentDir(); m_list->SetFocus(); UpdateControls(); + ignoreChanges = false; return; } #ifdef __UNIX__ if (filename == wxT("~")) { + ignoreChanges = true; m_list->GoToHomeDir(); m_list->SetFocus(); UpdateControls(); + ignoreChanges = false; return; } if (filename.BeforeFirst(wxT('/')) == wxT("~")) { - filename = wxGetUserHome() + filename.Remove(0, 1); + filename = wxString(wxGetUserHome()) + filename.Remove(0, 1); } #endif // __UNIX__ - if ((filename.Find(wxT('*')) != wxNOT_FOUND) || - (filename.Find(wxT('?')) != wxNOT_FOUND)) + if (!HasFlag(wxFD_SAVE)) { - if (filename.Find(wxFILE_SEP_PATH) != wxNOT_FOUND) + if ((filename.Find(wxT('*')) != wxNOT_FOUND) || + (filename.Find(wxT('?')) != wxNOT_FOUND)) { - wxMessageBox(_("Illegal file specification."), _("Error"), wxOK | wxICON_ERROR ); + if (filename.Find(wxFILE_SEP_PATH) != wxNOT_FOUND) + { + wxMessageBox(_("Illegal file specification."), _("Error"), wxOK | wxICON_ERROR ); + return; + } + m_list->SetWild( filename ); return; } - m_list->SetWild( filename ); - return; } if (!IsTopMostDir(dir)) @@ -1175,8 +1429,10 @@ void wxGenericFileDialog::HandleAction( const wxString &fn ) if (wxDirExists(filename)) { + ignoreChanges = true; m_list->GoToDir( filename ); UpdateControls(); + ignoreChanges = false; return; } @@ -1193,25 +1449,22 @@ void wxGenericFileDialog::HandleAction( const wxString &fn ) // VZ: the logic of testing for !wxFileExists() only for the open file // dialog is not entirely clear to me, why don't we allow saving to a // file without extension as well? - if ( !(m_dialogStyle & wxOPEN) || !wxFileExists(filename) ) + if ( !HasFlag(wxFD_OPEN) || !wxFileExists(filename) ) { filename = AppendExtension(filename, m_filterExtension); } // check that the file [doesn't] exist if necessary - if ( (m_dialogStyle & wxSAVE) && - (m_dialogStyle & wxOVERWRITE_PROMPT) && + if ( HasFlag(wxFD_SAVE) && HasFlag(wxFD_OVERWRITE_PROMPT) && wxFileExists( filename ) ) { wxString msg; - msg.Printf( _("File '%s' already exists, do you really want to " - "overwrite it?"), filename.c_str() ); + msg.Printf( _("File '%s' already exists, do you really want to overwrite it?"), filename.c_str() ); if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES) return; } - else if ( (m_dialogStyle & wxOPEN) && - (m_dialogStyle & wxFILE_MUST_EXIST) && + else if ( HasFlag(wxFD_OPEN) && HasFlag(wxFD_FILE_MUST_EXIST) && !wxFileExists(filename) ) { wxMessageBox(_("Please choose an existing file."), _("Error"), @@ -1221,19 +1474,18 @@ void wxGenericFileDialog::HandleAction( const wxString &fn ) SetPath( filename ); // change to the directory where the user went if asked - if ( m_dialogStyle & wxCHANGE_DIR ) + if ( HasFlag(wxFD_CHANGE_DIR) ) { wxString cwd; wxSplitPath(filename, &cwd, NULL, NULL); - if ( cwd != wxGetWorkingDirectory() ) + if ( cwd != wxGetCwd() ) { wxSetWorkingDirectory(cwd); } } - wxCommandEvent event; - wxDialog::OnOK(event); + EndModal(wxID_OK); } void wxGenericFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) ) @@ -1243,41 +1495,59 @@ void wxGenericFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) ) void wxGenericFileDialog::OnList( wxCommandEvent &WXUNUSED(event) ) { + ignoreChanges = true; m_list->ChangeToListMode(); ms_lastViewStyle = wxLC_LIST; m_list->SetFocus(); + ignoreChanges = false; } void wxGenericFileDialog::OnReport( wxCommandEvent &WXUNUSED(event) ) { + ignoreChanges = true; m_list->ChangeToReportMode(); ms_lastViewStyle = wxLC_REPORT; m_list->SetFocus(); + ignoreChanges = false; } void wxGenericFileDialog::OnUp( wxCommandEvent &WXUNUSED(event) ) { + ignoreChanges = true; m_list->GoToParentDir(); m_list->SetFocus(); UpdateControls(); + ignoreChanges = false; } void wxGenericFileDialog::OnHome( wxCommandEvent &WXUNUSED(event) ) { + ignoreChanges = true; m_list->GoToHomeDir(); m_list->SetFocus(); UpdateControls(); + ignoreChanges = false; } void wxGenericFileDialog::OnNew( wxCommandEvent &WXUNUSED(event) ) { + ignoreChanges = true; + m_list->MakeDir(); + + ignoreChanges = false; } void wxGenericFileDialog::SetPath( const wxString& path ) { // not only set the full path but also update filename and dir m_path = path; + +#ifdef __WXWINCE__ + if (m_path.empty()) + m_path = wxFILE_SEP_PATH; +#endif + if ( !path.empty() ) { wxString ext; @@ -1304,6 +1574,9 @@ void wxGenericFileDialog::GetPaths( wxArrayString& paths ) const wxString dir = m_list->GetDir(); #ifdef __UNIX__ if (dir != wxT("/")) +#endif +#ifdef __WXWINCE__ + if (dir != wxT("/") && dir != wxT("\\")) #endif dir += wxFILE_SEP_PATH; @@ -1351,16 +1624,15 @@ void wxGenericFileDialog::UpdateControls() bool enable = !IsTopMostDir(dir); m_upDirButton->Enable(enable); -#if defined(__DOS__) || defined(__WINDOWS__) +#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) m_newDirButton->Enable(enable); -#endif // defined(__DOS__) || defined(__WINDOWS__) +#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) } -#ifdef USE_GENERIC_FILEDIALOG +#ifdef wxUSE_GENERIC_FILEDIALOG -IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog); +IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog) -#endif // USE_GENERIC_FILEDIALOG +#endif // wxUSE_GENERIC_FILEDIALOG #endif // wxUSE_FILEDLG -