X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/18680f86512504f043ad5d0b222afc7be87aa3e9..950905affdfa9041316f82308e1a11e82c783070:/src/msw/filedlg.cpp?ds=inline diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index 76c8f73ecc..175b241358 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -29,6 +29,8 @@ #include "wx/filedlg.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcdlg.h" + #include "wx/msw/missing.h" #include "wx/utils.h" #include "wx/msgdlg.h" #include "wx/filefn.h" @@ -38,16 +40,12 @@ #include "wx/math.h" #endif -#include "wx/msw/wrapcdlg.h" - #include #include #include "wx/filename.h" #include "wx/tokenzr.h" -#include "wx/msw/missing.h" - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -278,15 +276,9 @@ int wxFileDialog::ShowModal() *fileNameBuffer = wxT('\0'); *titleBuffer = wxT('\0'); -#if WXWIN_COMPATIBILITY_2_4 - long msw_flags = 0; - if ( (m_windowStyle & wxHIDE_READONLY) || (m_windowStyle & wxFD_SAVE) ) - msw_flags |= OFN_HIDEREADONLY; -#else long msw_flags = OFN_HIDEREADONLY; -#endif - if ( m_windowStyle & wxFD_FILE_MUST_EXIST ) + if ( HasFdFlag(wxFD_FILE_MUST_EXIST) ) msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; /* If the window has been moved the programmer is probably @@ -304,7 +296,7 @@ int wxFileDialog::ShowModal() #endif } - if (m_windowStyle & wxFD_MULTIPLE ) + if ( HasFdFlag(wxFD_MULTIPLE) ) { // OFN_EXPLORER must always be specified with OFN_ALLOWMULTISELECT msw_flags |= OFN_EXPLORER | OFN_ALLOWMULTISELECT; @@ -313,12 +305,12 @@ int wxFileDialog::ShowModal() // if wxFD_CHANGE_DIR flag is not given we shouldn't change the CWD which the // standard dialog does by default (notice that under NT it does it anyhow, // OFN_NOCHANGEDIR or not, see below) - if ( !(m_windowStyle & wxFD_CHANGE_DIR) ) + if ( !HasFdFlag(wxFD_CHANGE_DIR) ) { msw_flags |= OFN_NOCHANGEDIR; } - if ( m_windowStyle & wxFD_OVERWRITE_PROMPT ) + if ( HasFdFlag(wxFD_OVERWRITE_PROMPT) ) { msw_flags |= OFN_OVERWRITEPROMPT; } @@ -328,7 +320,7 @@ int wxFileDialog::ShowModal() of.lStructSize = gs_ofStructSize; of.hwndOwner = hWnd; - of.lpstrTitle = WXSTRINGCAST m_message; + of.lpstrTitle = m_message.wx_str(); of.lpstrFileTitle = titleBuffer; of.nMaxFileTitle = wxMAXFILE + 1 + wxMAXEXT; @@ -399,12 +391,12 @@ int wxFileDialog::ShowModal() } } - of.lpstrFilter = (LPTSTR)filterBuffer.c_str(); + of.lpstrFilter = (LPTSTR)filterBuffer.wx_str(); of.nFilterIndex = m_filterIndex + 1; //=== Setting defaultFileName >>========================================= - wxStrncpy( fileNameBuffer, (const wxChar *)m_fileName, wxMAXPATH-1 ); + wxStrncpy(fileNameBuffer, m_fileName, wxMAXPATH-1); fileNameBuffer[ wxMAXPATH-1 ] = wxT('\0'); of.lpstrFile = fileNameBuffer; // holds returned filename @@ -415,9 +407,9 @@ int wxFileDialog::ShowModal() // user types "foo" and the default extension is ".bar" we should force it // to check for "foo.bar" existence and not "foo") wxString defextBuffer; // we need it to be alive until GetSaveFileName()! - if (m_windowStyle & wxFD_SAVE) + if (HasFdFlag(wxFD_SAVE)) { - const wxChar* extension = filterBuffer; + const wxChar* extension = filterBuffer.wx_str(); int maxFilter = (int)(of.nFilterIndex*2L) - 1; for( int i = 0; i < maxFilter; i++ ) // get extension @@ -427,7 +419,7 @@ int wxFileDialog::ShowModal() defextBuffer = AppendExtension(wxT("a"), extension); if (defextBuffer.StartsWith(wxT("a."))) { - defextBuffer.Mid(2); + defextBuffer = defextBuffer.Mid(2); // remove "a." of.lpstrDefExt = defextBuffer.c_str(); } } @@ -472,7 +464,7 @@ int wxFileDialog::ShowModal() m_fileNames.Empty(); - if ( ( m_windowStyle & wxFD_MULTIPLE ) && + if ( ( HasFdFlag(wxFD_MULTIPLE) ) && #if defined(OFN_EXPLORER) ( fileNameBuffer[of.nFileOffset-1] == wxT('\0') ) #else @@ -519,7 +511,7 @@ int wxFileDialog::ShowModal() (of.nFileExtension && fileNameBuffer[of.nFileExtension] == wxT('\0')) ) { // User has typed a filename without an extension: - const wxChar* extension = filterBuffer; + const wxChar* extension = filterBuffer.wx_str(); int maxFilter = (int)(of.nFilterIndex*2L) - 1; for( int i = 0; i < maxFilter; i++ ) // get extension