X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/caae22fb66f5d908f7d74454d0d754db8d926897..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/msw/wince/filedlgwce.cpp diff --git a/src/msw/wince/filedlgwce.cpp b/src/msw/wince/filedlgwce.cpp index 6d0cfe94cf..6ad061639e 100644 --- a/src/msw/wince/filedlgwce.cpp +++ b/src/msw/wince/filedlgwce.cpp @@ -29,11 +29,12 @@ #if wxUSE_FILEDLG && defined(__SMARTPHONE__) && defined(__WXWINCE__) +#include "wx/filedlg.h" + #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/msgdlg.h" #include "wx/dialog.h" - #include "wx/filedlg.h" #include "wx/filefn.h" #include "wx/intl.h" #include "wx/log.h" @@ -67,12 +68,14 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& defaultFileName, const wxString& wildCard, long style, - const wxPoint& WXUNUSED(pos)) + const wxPoint& WXUNUSED(pos), + const wxSize& WXUNUSED(sz), + const wxString& WXUNUSED(name)) { m_message = message; - m_dialogStyle = style; - if ( ( m_dialogStyle & wxMULTIPLE ) && ( m_dialogStyle & wxSAVE ) ) - m_dialogStyle &= ~wxMULTIPLE; + m_windowStyle = style; + if ( ( m_windowStyle & wxFD_MULTIPLE ) && ( m_windowStyle & wxFD_SAVE ) ) + m_windowStyle &= ~wxFD_MULTIPLE; m_parent = parent; m_path = wxEmptyString; m_fileName = defaultFileName; @@ -86,8 +89,8 @@ void wxFileDialog::GetPaths(wxArrayString& paths) const paths.Empty(); wxString dir(m_dir); - if ( m_dir.Last() != _T('\\') ) - dir += _T('\\'); + if ( m_dir.Last() != wxT('\\') ) + dir += wxT('\\'); size_t count = m_fileNames.GetCount(); for ( size_t n = 0; n < count; n++ ) @@ -102,9 +105,9 @@ void wxFileDialog::GetPaths(wxArrayString& paths) const void wxFileDialog::SetPath(const wxString& path) { wxString ext; - wxSplitPath(path, &m_dir, &m_fileName, &ext); + wxFileName::SplitPath(path, &m_dir, &m_fileName, &ext); if ( !ext.empty() ) - m_fileName << _T('.') << ext; + m_fileName << wxT('.') << ext; } int wxFileDialog::ShowModal()