X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3660be5d50e0874bb26699e1c9ab481976ea4fa9..9bc3af3e642709425476f6232a19fe4f1bbb42b8:/src/os2/filedlg.cpp diff --git a/src/os2/filedlg.cpp b/src/os2/filedlg.cpp index 0fa360c0d4..65c8c59df4 100644 --- a/src/os2/filedlg.cpp +++ b/src/os2/filedlg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: filedlg.cpp +// Name: src/os2/filedlg.cpp // Purpose: wxFileDialog // Author: David Webster // Modified by: @@ -16,13 +16,18 @@ #pragma hdrstop #endif +#if wxUSE_FILEDLG + +#include "wx/filedlg.h" + #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/msgdlg.h" - #include "wx/filedlg.h" + #include "wx/filename.h" #include "wx/intl.h" #include "wx/log.h" #include "wx/app.h" + #include "wx/math.h" #endif #define INCL_PM @@ -30,11 +35,11 @@ #include "wx/os2/private.h" -#include #include #include #include "wx/tokenzr.h" +#include "wx/testing.h" #define wxMAXPATH 1024 #define wxMAXFILE 1024 @@ -55,6 +60,7 @@ #ifndef MAXEXT # define MAXEXT 5 #endif + IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase) // ---------------------------------------------------------------------------- @@ -68,13 +74,14 @@ wxFileDialog::wxFileDialog ( , const wxString& rsDefaultFileName , const wxString& rsWildCard , long lStyle -, const wxPoint& rPos +, const wxPoint& rPos, + const wxSize& sz, + const wxString& name ) - :wxFileDialogBase(pParent, rsMessage, rsDefaultDir, rsDefaultFileName, rsWildCard, lStyle, rPos) + :wxFileDialogBase(pParent, rsMessage, rsDefaultDir, rsDefaultFileName, rsWildCard, lStyle, rPos, sz, name) { - if ((m_dialogStyle & wxMULTIPLE) && (m_dialogStyle & wxSAVE)) - m_dialogStyle &= ~wxMULTIPLE; + // NB: all style checks are done by wxFileDialogBase::Create m_filterIndex = 1; } // end of wxFileDialog::wxFileDialog @@ -87,8 +94,8 @@ void wxFileDialog::GetPaths ( size_t nCount = m_fileNames.GetCount(); rasPaths.Empty(); - if (m_dir.Last() != _T('\\')) - sDir += _T('\\'); + if (m_dir.Last() != wxT('\\')) + sDir += wxT('\\'); for ( size_t n = 0; n < nCount; n++ ) { @@ -98,6 +105,8 @@ void wxFileDialog::GetPaths ( int wxFileDialog::ShowModal() { + WX_TESTING_SHOW_MODAL_HOOK(); + wxString sTheFilter; wxString sFilterBuffer; wxChar* pzFilterBuffer; @@ -121,24 +130,19 @@ int wxFileDialog::ShowModal() *zFileNameBuffer = wxT('\0'); *zTitleBuffer = wxT('\0'); - if (m_dialogStyle & wxSAVE) + if (m_windowStyle & wxFD_SAVE) lFlags = FDS_SAVEAS_DIALOG; else lFlags = FDS_OPEN_DIALOG; -#if WXWIN_COMPATIBILITY_2_4 - if (m_dialogStyle & wxHIDE_READONLY) + if (m_windowStyle & wxFD_SAVE) lFlags |= FDS_SAVEAS_DIALOG; -#endif - - if (m_dialogStyle & wxSAVE) - lFlags |= FDS_SAVEAS_DIALOG; - if (m_dialogStyle & wxMULTIPLE ) + if (m_windowStyle & wxFD_MULTIPLE) lFlags |= FDS_OPEN_DIALOG | FDS_MULTIPLESEL; vFileDlg.cbSize = sizeof(FILEDLG); vFileDlg.fl = lFlags; - vFileDlg.pszTitle = zTitleBuffer; + vFileDlg.pszTitle = (PSZ)zTitleBuffer; // // Convert forward slashes to backslashes (file selector doesn't like @@ -152,21 +156,21 @@ int wxFileDialog::ShowModal() switch (ch) { - case _T('/'): + case wxT('/'): // // Convert to backslash // - ch = _T('\\'); + ch = wxT('\\'); // // Fall through // - case _T('\\'): + case wxT('\\'): while (i < nLen - 1) { wxChar chNext = m_dir[i + 1]; - if (chNext != _T('\\') && chNext != _T('/')) + if (chNext != wxT('\\') && chNext != wxT('/')) break; // @@ -189,11 +193,11 @@ int wxFileDialog::ShowModal() } } if ( wxStrlen(m_wildCard) == 0 ) - sTheFilter = ""; + sTheFilter = wxEmptyString; else sTheFilter = m_wildCard; - pzFilterBuffer = strtok((char*)sTheFilter.c_str(), "|"); + wxStrtok(sTheFilter.wchar_str(), wxT("|"), &pzFilterBuffer); while(pzFilterBuffer != NULL) { if (nCount > 0 && !(nCount % 2)) @@ -202,14 +206,14 @@ int wxFileDialog::ShowModal() { sDir += pzFilterBuffer; } - pzFilterBuffer = strtok(NULL, "|"); + wxStrtok(NULL, wxT("|"), &pzFilterBuffer); nCount++; } if (nCount == 0) sDir += m_fileName; - if (sDir.IsEmpty()) - sDir = "*.*"; - wxStrcpy(vFileDlg.szFullFile, sDir.c_str()); + if (sDir.empty()) + sDir = wxT("*.*"); + wxStrcpy((wxChar*)vFileDlg.szFullFile, sDir); sFilterBuffer = sDir; hWnd = ::WinFileDlg( HWND_DESKTOP @@ -219,41 +223,41 @@ int wxFileDialog::ShowModal() if (hWnd && vFileDlg.lReturn == DID_OK) { m_fileNames.Empty(); - if ((m_dialogStyle & wxMULTIPLE ) && vFileDlg.ulFQFCount > 1) + if ((m_windowStyle & wxFD_MULTIPLE ) && vFileDlg.ulFQFCount > 1) { for (int i = 0; i < (int)vFileDlg.ulFQFCount; i++) { if (i == 0) { - m_dir = wxPathOnly(wxString((const char*)*vFileDlg.papszFQFilename[0])); - m_path = (const char*)*vFileDlg.papszFQFilename[0]; + m_dir = wxPathOnly(wxString((const wxChar*)*vFileDlg.papszFQFilename[0])); + m_path = (const wxChar*)*vFileDlg.papszFQFilename[0]; } - m_fileName = wxFileNameFromPath(wxString((const char*)*vFileDlg.papszFQFilename[i])); + m_fileName = wxFileNameFromPath(wxString((const wxChar*)*vFileDlg.papszFQFilename[i])); m_fileNames.Add(m_fileName); } ::WinFreeFileDlgList(vFileDlg.papszFQFilename); } - else if (!(m_dialogStyle & wxSAVE)) + else if (!(m_windowStyle & wxFD_SAVE)) { - m_path = vFileDlg.szFullFile; - m_fileName = wxFileNameFromPath(vFileDlg.szFullFile); - m_dir = wxPathOnly(vFileDlg.szFullFile); + m_path = (wxChar*)vFileDlg.szFullFile; + m_fileName = wxFileNameFromPath(wxString((const wxChar*)vFileDlg.szFullFile)); + m_dir = wxPathOnly((const wxChar*)vFileDlg.szFullFile); } else // save file { const wxChar* pzExtension = NULL; - wxStrcpy(zFileNameBuffer, vFileDlg.szFullFile); + wxStrcpy(zFileNameBuffer, (const wxChar*)vFileDlg.szFullFile); int nIdx = wxStrlen(zFileNameBuffer) - 1; wxString sExt; - wxSplitPath( zFileNameBuffer - ,&m_path - ,&m_fileName - ,&sExt - ); - if (zFileNameBuffer[nIdx] == wxT('.') || sExt.IsEmpty()) + wxFileName::SplitPath( zFileNameBuffer + ,&m_path + ,&m_fileName + ,&sExt + ); + if (zFileNameBuffer[nIdx] == wxT('.') || sExt.empty()) { zFileNameBuffer[nIdx] = wxT('\0'); @@ -290,16 +294,16 @@ int wxFileDialog::ShowModal() } else { - m_path = vFileDlg.szFullFile; + m_path = (wxChar*)vFileDlg.szFullFile; } - m_fileName = wxFileNameFromPath(vFileDlg.szFullFile); - m_dir = wxPathOnly(vFileDlg.szFullFile); + m_fileName = wxFileNameFromPath((const wxChar*)vFileDlg.szFullFile); + m_dir = wxPathOnly((const wxChar*)vFileDlg.szFullFile); // - // === Simulating the wxOVERWRITE_PROMPT >>============================ + // === Simulating the wxFD_OVERWRITE_PROMPT >>============================ // - if ((m_dialogStyle & wxOVERWRITE_PROMPT) && - (m_dialogStyle & wxSAVE) && + if ((m_windowStyle & wxFD_OVERWRITE_PROMPT) && + (m_windowStyle & wxFD_SAVE) && (wxFileExists(m_path.c_str()))) { wxString sMessageText; @@ -321,3 +325,4 @@ int wxFileDialog::ShowModal() return wxID_CANCEL; } // end of wxFileDialog::ShowModal +#endif // wxUSE_FILEDLG