X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/812a5849e564cd511c49081edbaac17b19a418a3..72045d5768a126191a907bc640c28e81a11afdd6:/src/generic/filedlgg.cpp diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index 5f673a532f..5264d09285 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -13,7 +13,7 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_FILEDLG @@ -23,26 +23,32 @@ #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" +#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/intl.h" -#include "wx/msgdlg.h" -#include "wx/sizer.h" -#include "wx/bmpbuttn.h" #include "wx/tokenzr.h" #include "wx/config.h" #include "wx/imaglist.h" #include "wx/dir.h" #include "wx/artprov.h" -#include "wx/settings.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 @@ -50,8 +56,10 @@ #include "wx/tooltip.h" #endif -#include -#include +#ifndef __WXWINCE__ + #include + #include +#endif #ifdef __UNIX__ #include @@ -62,7 +70,6 @@ #endif #ifdef __WINDOWS__ - #include "wx/msw/wrapwin.h" #include "wx/msw/mslu.h" #endif @@ -70,7 +77,10 @@ #include #endif +#ifndef __WXWINCE__ #include +#endif + #if defined(__UNIX__) || defined(__DOS__) #include #endif @@ -159,7 +169,9 @@ int wxCALLBACK wxFileDataTimeCompare(long data1, long data2, long sortOrder) return fd1->GetDateTime().IsLaterThan(fd2->GetDateTime()) ? sortOrder : -sortOrder; } -#if defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__) +#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("/")) @@ -209,7 +221,7 @@ void wxFileData::ReadData() return; } -#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) +#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)) { @@ -219,6 +231,40 @@ 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( __OS2__ ) && !defined(__VMS)) @@ -237,21 +283,11 @@ void wxFileData::ReadData() 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 (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND) - { - m_image = wxTheFileIconsTable->GetIconID( m_fileName.AfterLast(wxT('.'))); - } else if (IsExe()) - { - m_image = wxFileIconsTable::executable; - } - } - 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"), @@ -265,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"), @@ -275,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 @@ -309,7 +357,7 @@ wxString wxFileData::GetHint() const else if (IsDrive()) s += _(""); else // plain file - s += wxString::Format(_("%ld bytes"), + s += wxString::Format(wxPLURAL("%ld byte", "%ld bytes", m_size), wxLongLong(m_size).ToString().c_str()); s += wxT(' '); @@ -390,6 +438,8 @@ void wxFileData::MakeItem( wxListItem &item ) // wxFileCtrl //----------------------------------------------------------------------------- +static bool ignoreChanges = false; + IMPLEMENT_DYNAMIC_CLASS(wxFileCtrl,wxListCtrl) BEGIN_EVENT_TABLE(wxFileCtrl,wxListCtrl) @@ -531,7 +581,7 @@ void wxFileCtrl::UpdateFiles() item.m_itemId = 0; item.m_col = 0; -#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__OS2__) +#if (defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__OS2__)) && !defined(__WXWINCE__) if ( IsTopMostDir(m_dirName) ) { wxArrayString names, paths; @@ -551,10 +601,10 @@ void wxFileCtrl::UpdateFiles() #endif // defined(__DOS__) || defined(__WINDOWS__) { // Real directory... - if ( !IsTopMostDir(m_dirName) ) + if ( !IsTopMostDir(m_dirName) && !m_dirName.empty() ) { wxString p(wxPathOnly(m_dirName)); -#if defined(__UNIX__) && !defined(__OS2__) +#if (defined(__UNIX__) || defined(__WXWINCE__)) && !defined(__OS2__) if (p.empty()) p = wxT("/"); #endif // __UNIX__ wxFileData *fd = new wxFileData(p, wxT(".."), wxFileData::is_dir, wxFileIconsTable::folder); @@ -569,6 +619,11 @@ void wxFileCtrl::UpdateFiles() if (dirname.length() == 2 && dirname[1u] == wxT(':')) dirname << wxT('\\'); #endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) + + if (dirname.empty()) + dirname = wxFILE_SEP_PATH; + + wxLogNull logNull; wxDir dir(dirname); if ( dir.IsOpened() ) @@ -680,7 +735,7 @@ void wxFileCtrl::GoToParentDir() { if (!IsTopMostDir(m_dirName)) { - size_t len = m_dirName.Len(); + size_t len = m_dirName.length(); if (wxEndsWithPathSeparator(m_dirName)) m_dirName.Remove( len-1, 1 ); wxString fname( wxFileNameFromPath(m_dirName) ); @@ -699,8 +754,10 @@ void wxFileCtrl::GoToParentDir() long id = FindItem( 0, fname ); if (id != wxNOT_FOUND) { + ignoreChanges = true; SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); EnsureVisible( id ); + ignoreChanges = false; } } } @@ -717,7 +774,11 @@ void wxFileCtrl::GoToDir( const wxString &dir ) m_dirName = dir; UpdateFiles(); + + ignoreChanges = true; SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); + ignoreChanges = false; + EnsureVisible( 0 ); } @@ -762,8 +823,8 @@ void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event ) wxASSERT( fd ); if ((event.GetLabel().empty()) || - (event.GetLabel() == _(".")) || - (event.GetLabel() == _("..")) || + (event.GetLabel() == wxT(".")) || + (event.GetLabel() == wxT("..")) || (event.GetLabel().First( wxFILE_SEP_PATH ) != wxNOT_FOUND)) { wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR ); @@ -788,7 +849,11 @@ void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event ) if (wxRenameFile(fd->GetFilePath(),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() ); } @@ -910,10 +975,12 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, const wxString& wildCard, long style, const wxPoint& pos, + const wxSize& sz, + const wxString& name, bool bypassGenericImpl ) : wxFileDialogBase() { Init(); - Create( parent, message, defaultDir, defaultFile, wildCard, style, pos, bypassGenericImpl ); + Create( parent, message, defaultDir, defaultFile, wildCard, style, pos, sz, name, bypassGenericImpl ); } bool wxGenericFileDialog::Create( wxWindow *parent, @@ -923,12 +990,14 @@ bool wxGenericFileDialog::Create( wxWindow *parent, 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)) + wildCard, style, pos, sz, name)) { return false; } @@ -936,12 +1005,15 @@ bool wxGenericFileDialog::Create( wxWindow *parent, if (m_bypassGenericImpl) return true; - if (!wxDialog::Create( parent, wxID_ANY, message, pos, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER )) + if (!wxDialog::Create( parent, wxID_ANY, message, pos, sz, + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER, name + )) { return false; } + ignoreChanges = true; + if (wxConfig::Get(false)) { wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"), @@ -950,17 +1022,14 @@ bool wxGenericFileDialog::Create( 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 ); @@ -1032,10 +1101,16 @@ bool wxGenericFileDialog::Create( wxWindow *parent, 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, wxEmptyString, ms_lastShowHidden, wxDefaultPosition, wxSize(540,200), @@ -1047,7 +1122,7 @@ bool wxGenericFileDialog::Create( wxWindow *parent, mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 ); 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 ); @@ -1055,17 +1130,22 @@ bool wxGenericFileDialog::Create( wxWindow *parent, 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 ), 0, wxCENTER | wxALL, 5 ); - buttonsizer->Add( new wxButton( this, wxID_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 ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 ); mainsizer->Add( textsizer, 0, wxEXPAND ); @@ -1085,18 +1165,25 @@ bool wxGenericFileDialog::Create( wxWindow *parent, 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() { + ignoreChanges = true; + if (!m_bypassGenericImpl) { if (wxConfig::Get(false)) @@ -1117,21 +1204,28 @@ wxGenericFileDialog::~wxGenericFileDialog() 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 ); } @@ -1202,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) @@ -1230,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; m_text->SetValue( filename ); ignoreChanges = false; +#endif + inSelected = false; } void wxGenericFileDialog::HandleAction( const wxString &fn ) { + if (ignoreChanges) + return; + wxString filename( fn ); - wxString dir = m_list->GetDir(); - if (filename.empty()) 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) @@ -1258,18 +1379,22 @@ 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; } @@ -1279,7 +1404,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn ) } #endif // __UNIX__ - if (!(m_dialogStyle & wxSAVE)) + if (!HasFlag(wxFD_SAVE)) { if ((filename.Find(wxT('*')) != wxNOT_FOUND) || (filename.Find(wxT('?')) != wxNOT_FOUND)) @@ -1304,8 +1429,10 @@ void wxGenericFileDialog::HandleAction( const wxString &fn ) if (wxDirExists(filename)) { + ignoreChanges = true; m_list->GoToDir( filename ); UpdateControls(); + ignoreChanges = false; return; } @@ -1322,14 +1449,13 @@ 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; @@ -1338,8 +1464,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn ) 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"), @@ -1349,7 +1474,7 @@ 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); @@ -1360,8 +1485,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn ) } } - wxCommandEvent event; - wxDialog::OnOK(event); + EndModal(wxID_OK); } void wxGenericFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) ) @@ -1371,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; @@ -1432,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; @@ -1484,10 +1629,10 @@ void wxGenericFileDialog::UpdateControls() #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