X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b014db05bb062ddacf19e22b4c638d8ac5429d95..b81e45065986abc34676fecc31515efeb3f3a8d4:/src/msw/filedlg.cpp diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index 63e5f18dfd..0cc25b19d6 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -64,7 +64,8 @@ // globals // ---------------------------------------------------------------------------- -// standard dialog size +// standard dialog size for the old Windows systems where the dialog wasn't +// resizeable static wxRect gs_rectDialog(0, 0, 428, 266); // ============================================================================ @@ -87,19 +88,12 @@ wxFileDialogHookFunction(HWND hDlg, { case WM_NOTIFY: { - OFNOTIFY *pNotifyCode = wx_reinterpret_cast(OFNOTIFY *, lParam); + OFNOTIFY *pNotifyCode = reinterpret_cast(lParam); if ( pNotifyCode->hdr.code == CDN_INITDONE ) { - // note that we need to move the parent window: hDlg is a - // child of it when OFN_EXPLORER is used - ::SetWindowPos - ( - ::GetParent(hDlg), - HWND_TOP, - gs_rectDialog.x, gs_rectDialog.y, - 0, 0, - SWP_NOZORDER | SWP_NOSIZE - ); + reinterpret_cast( + pNotifyCode->lpOFN->lCustData) + ->MSWOnInitDone((WXHWND)hDlg); } } break; @@ -138,14 +132,15 @@ wxFileDialog::wxFileDialog(wxWindow *parent, // NB: all style checks are done by wxFileDialogBase::Create m_bMovedWindow = false; + m_centreDir = 0; // Must set to zero, otherwise the wx routines won't size the window // the second time you call the file dialog, because it thinks it is // already at the requested size.. (when centering) gs_rectDialog.x = gs_rectDialog.y = 0; - } + void wxFileDialog::GetPaths(wxArrayString& paths) const { paths.Empty(); @@ -172,7 +167,7 @@ void wxFileDialog::GetFilenames(wxArrayString& files) 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; } @@ -185,7 +180,6 @@ void wxFileDialog::DoGetPosition(int *x, int *y) const *y = gs_rectDialog.y; } - void wxFileDialog::DoGetSize(int *width, int *height) const { if ( width ) @@ -196,19 +190,70 @@ void wxFileDialog::DoGetSize(int *width, int *height) const void wxFileDialog::DoMoveWindow(int x, int y, int WXUNUSED(w), int WXUNUSED(h)) { - m_bMovedWindow = true; - gs_rectDialog.x = x; gs_rectDialog.y = y; - // size of the dialog can't be changed because the controls are not laid - // out correctly then + // our HWND is only set when we're called from MSWOnInitDone(), test if + // this is the case + HWND hwnd = GetHwnd(); + if ( hwnd ) + { + // size of the dialog can't be changed because the controls are not + // laid out correctly then + ::SetWindowPos(hwnd, HWND_TOP, x, y, 0, 0, SWP_NOZORDER | SWP_NOSIZE); + } + else // just remember that we were requested to move the window + { + m_bMovedWindow = true; + + // if Centre() had been called before, it shouldn't be taken into + // account now + m_centreDir = 0; + } +} + +void wxFileDialog::DoCentre(int dir) +{ + m_centreDir = dir; + m_bMovedWindow = true; + + // it's unnecessary to do anything else at this stage as we'll redo it in + // MSWOnInitDone() anyhow +} + +void wxFileDialog::MSWOnInitDone(WXHWND hDlg) +{ + // note the the dialog is the parent window: hDlg is a child of it when + // OFN_EXPLORER is used + HWND hFileDlg = ::GetParent((HWND)hDlg); + + // set HWND so that our DoMoveWindow() works correctly + SetHWND((WXHWND)hFileDlg); + + if ( m_centreDir ) + { + // now we have the real dialog size, remember it + RECT rect; + GetWindowRect(hFileDlg, &rect); + gs_rectDialog = wxRectFromRECT(rect); + + // and position the window correctly: notice that we must use the base + // class version as our own doesn't do anything except setting flags + wxFileDialogBase::DoCentre(m_centreDir); + } + else // need to just move it to the correct place + { + SetPosition(gs_rectDialog.GetPosition()); + } + + // we shouldn't destroy this HWND + SetHWND(NULL); } -// helper used below in ShowModal(): style is used to determine whether to show -// the "Save file" dialog (if it contains wxFD_SAVE bit) or "Open file" one; -// returns true on success or false on failure in which case err is filled with -// the CDERR_XXX constant +// helper used below in ShowCommFileDialog(): style is used to determine +// whether to show the "Save file" dialog (if it contains wxFD_SAVE bit) or +// "Open file" one; returns true on success or false on failure in which case +// err is filled with the CDERR_XXX constant static bool DoShowCommFileDialog(OPENFILENAME *of, long style, DWORD *err) { if ( style & wxFD_SAVE ? GetSaveFileName(of) : GetOpenFileName(of) ) @@ -263,6 +308,58 @@ static bool DoShowCommFileDialog(OPENFILENAME *of, long style, DWORD *err) static DWORD gs_ofStructSize = wxOPENFILENAME_V5_SIZE; #endif // __WXWINCE__ || __WIN64__/!... +static bool ShowCommFileDialog(OPENFILENAME *of, long style) +{ + DWORD errCode; + bool success = DoShowCommFileDialog(of, style, &errCode); + +#ifdef wxTRY_SMALLER_OPENFILENAME + // the system might be too old to support the new version file dialog + // boxes, try with the old size + if ( !success && errCode == CDERR_STRUCTSIZE && + of->lStructSize != wxOPENFILENAME_V4_SIZE ) + { + of->lStructSize = wxOPENFILENAME_V4_SIZE; + + success = DoShowCommFileDialog(of, style, &errCode); + + if ( success || !errCode ) + { + // use this struct size for subsequent dialogs + gs_ofStructSize = of->lStructSize; + } + } +#endif // wxTRY_SMALLER_OPENFILENAME + + if ( !success && + // FNERR_INVALIDFILENAME is not defined under CE (besides we don't + // use CommDlgExtendedError() there anyhow) +#ifndef __WXWINCE__ + errCode == FNERR_INVALIDFILENAME && +#endif // !__WXWINCE__ + of->lpstrFile[0] ) + { + // this can happen if the default file name is invalid, try without it + // now + of->lpstrFile[0] = _T('\0'); + success = DoShowCommFileDialog(of, style, &errCode); + } + + if ( !success ) + { + // common dialog failed - why? + if ( errCode != 0 ) + { + wxLogError(_("File dialog failed with error code %0lx."), errCode); + } + //else: it was just cancelled + + return false; + } + + return true; +} + int wxFileDialog::ShowModal() { HWND hWnd = 0; @@ -276,13 +373,7 @@ int wxFileDialog::ShowModal() *fileNameBuffer = wxT('\0'); *titleBuffer = wxT('\0'); -#if WXWIN_COMPATIBILITY_2_4 - long msw_flags = 0; - if ( HasFdFlag(wxHIDE_READONLY) || HasFdFlag(wxFD_SAVE) ) - msw_flags |= OFN_HIDEREADONLY; -#else long msw_flags = OFN_HIDEREADONLY; -#endif if ( HasFdFlag(wxFD_FILE_MUST_EXIST) ) msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; @@ -326,7 +417,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; @@ -373,6 +464,7 @@ int wxFileDialog::ShowModal() of.Flags = msw_flags; of.lpfnHook = wxFileDialogHookFunction; + of.lCustData = (LPARAM)this; wxArrayString wildDescriptions, wildFilters; @@ -397,13 +489,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 ); - fileNameBuffer[ wxMAXPATH-1 ] = wxT('\0'); + wxStrlcpy(fileNameBuffer, m_fileName.c_str(), WXSIZEOF(fileNameBuffer)); of.lpstrFile = fileNameBuffer; // holds returned filename of.nMaxFile = wxMAXPATH; @@ -415,7 +506,7 @@ int wxFileDialog::ShowModal() wxString defextBuffer; // we need it to be alive until GetSaveFileName()! 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 @@ -425,7 +516,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(); } } @@ -435,120 +526,85 @@ int wxFileDialog::ShowModal() //== Execute FileDialog >>================================================= - DWORD errCode; - bool success = DoShowCommFileDialog(&of, m_windowStyle, &errCode); + if ( !ShowCommFileDialog(&of, m_windowStyle) ) + return wxID_CANCEL; -#ifdef wxTRY_SMALLER_OPENFILENAME - // the system might be too old to support the new version file dialog - // boxes, try with the old size - if ( !success && errCode == CDERR_STRUCTSIZE && - of.lStructSize != wxOPENFILENAME_V4_SIZE ) + // GetOpenFileName will always change the current working directory on + // (according to MSDN) "Windows NT 4.0/2000/XP" because the flag + // OFN_NOCHANGEDIR has no effect. If the user did not specify + // wxFD_CHANGE_DIR let's restore the current working directory to what it + // was before the dialog was shown. + if ( msw_flags & OFN_NOCHANGEDIR ) { - of.lStructSize = wxOPENFILENAME_V4_SIZE; - - success = DoShowCommFileDialog(&of, m_windowStyle, &errCode); - - if ( success || !errCode ) - { - // use this struct size for subsequent dialogs - gs_ofStructSize = of.lStructSize; - } + wxSetWorkingDirectory(cwdOrig); } -#endif // wxTRY_SMALLER_OPENFILENAME - - if ( success ) - { - // GetOpenFileName will always change the current working directory on - // (according to MSDN) "Windows NT 4.0/2000/XP" because the flag - // OFN_NOCHANGEDIR has no effect. If the user did not specify - // wxFD_CHANGE_DIR let's restore the current working directory to what it - // was before the dialog was shown. - if ( msw_flags & OFN_NOCHANGEDIR ) - { - wxSetWorkingDirectory(cwdOrig); - } - m_fileNames.Empty(); + m_fileNames.Empty(); - if ( ( HasFdFlag(wxFD_MULTIPLE) ) && + if ( ( HasFdFlag(wxFD_MULTIPLE) ) && #if defined(OFN_EXPLORER) - ( fileNameBuffer[of.nFileOffset-1] == wxT('\0') ) + ( fileNameBuffer[of.nFileOffset-1] == wxT('\0') ) #else - ( fileNameBuffer[of.nFileOffset-1] == wxT(' ') ) + ( fileNameBuffer[of.nFileOffset-1] == wxT(' ') ) #endif // OFN_EXPLORER - ) - { + ) + { #if defined(OFN_EXPLORER) - m_dir = fileNameBuffer; - i = of.nFileOffset; - m_fileName = &fileNameBuffer[i]; - m_fileNames.Add(m_fileName); - i += m_fileName.length() + 1; + m_dir = fileNameBuffer; + i = of.nFileOffset; + m_fileName = &fileNameBuffer[i]; + m_fileNames.Add(m_fileName); + i += m_fileName.length() + 1; - while (fileNameBuffer[i] != wxT('\0')) - { - m_fileNames.Add(&fileNameBuffer[i]); - i += wxStrlen(&fileNameBuffer[i]) + 1; - } + while (fileNameBuffer[i] != wxT('\0')) + { + m_fileNames.Add(&fileNameBuffer[i]); + i += wxStrlen(&fileNameBuffer[i]) + 1; + } #else - wxStringTokenizer toke(fileNameBuffer, _T(" \t\r\n")); - m_dir = toke.GetNextToken(); - m_fileName = toke.GetNextToken(); - m_fileNames.Add(m_fileName); + wxStringTokenizer toke(fileNameBuffer, _T(" \t\r\n")); + m_dir = toke.GetNextToken(); + m_fileName = toke.GetNextToken(); + m_fileNames.Add(m_fileName); - while (toke.HasMoreTokens()) - m_fileNames.Add(toke.GetNextToken()); + while (toke.HasMoreTokens()) + m_fileNames.Add(toke.GetNextToken()); #endif // OFN_EXPLORER - wxString dir(m_dir); - if ( m_dir.Last() != _T('\\') ) - dir += _T('\\'); + wxString dir(m_dir); + if ( m_dir.Last() != _T('\\') ) + dir += _T('\\'); - m_path = dir + m_fileName; - m_filterIndex = (int)of.nFilterIndex - 1; - } - else - { - //=== Adding the correct extension >>================================= + m_path = dir + m_fileName; + m_filterIndex = (int)of.nFilterIndex - 1; + } + else + { + //=== Adding the correct extension >>================================= - m_filterIndex = (int)of.nFilterIndex - 1; + m_filterIndex = (int)of.nFilterIndex - 1; - if ( !of.nFileExtension || - (of.nFileExtension && fileNameBuffer[of.nFileExtension] == wxT('\0')) ) - { - // User has typed a filename without an extension: - const wxChar* extension = filterBuffer; - int maxFilter = (int)(of.nFilterIndex*2L) - 1; - - for( int i = 0; i < maxFilter; i++ ) // get extension - extension = extension + wxStrlen( extension ) + 1; + if ( !of.nFileExtension || + (of.nFileExtension && fileNameBuffer[of.nFileExtension] == wxT('\0')) ) + { + // User has typed a filename without an extension: + const wxChar* extension = filterBuffer.wx_str(); + int maxFilter = (int)(of.nFilterIndex*2L) - 1; - m_fileName = AppendExtension(fileNameBuffer, extension); - wxStrncpy(fileNameBuffer, m_fileName.c_str(), wxMin(m_fileName.length(), wxMAXPATH-1)); - fileNameBuffer[wxMin(m_fileName.length(), wxMAXPATH-1)] = wxT('\0'); - } + for( int i = 0; i < maxFilter; i++ ) // get extension + extension = extension + wxStrlen( extension ) + 1; - m_path = fileNameBuffer; - m_fileName = wxFileNameFromPath(fileNameBuffer); - m_fileNames.Add(m_fileName); - m_dir = wxPathOnly(fileNameBuffer); + m_fileName = AppendExtension(fileNameBuffer, extension); + wxStrlcpy(fileNameBuffer, m_fileName.c_str(), WXSIZEOF(fileNameBuffer)); } - } -#ifdef __WXDEBUG__ - else - { - // common dialog failed - why? - if ( errCode != 0 ) - { - // this msg is only for developers so don't translate it - wxLogError(wxT("Common dialog failed with error code %0lx."), - errCode); + + m_path = fileNameBuffer; + m_fileName = wxFileNameFromPath(fileNameBuffer); + m_fileNames.Add(m_fileName); + m_dir = wxPathOnly(fileNameBuffer); } - //else: it was just cancelled - } -#endif // __WXDEBUG__ - return success ? wxID_OK : wxID_CANCEL; + return wxID_OK; }