X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0627d0917bc2e34724055f72e6c36787a7de642f..84bdb0d8d7d7fe3d7cd6a2e5f50ee247ce2af5df:/src/msw/filedlg.cpp?ds=sidebyside diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index 89bf4ae96c..abf12be798 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "filedlg.h" #endif @@ -28,40 +28,35 @@ #pragma hdrstop #endif -#if wxUSE_FILEDLG +#if wxUSE_FILEDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__)) #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" #include "wx/app.h" #endif -#include "wx/msw/private.h" +#include "wx/msw/wrapcdlg.h" -#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__) - #include -#endif - -#include #include #include +#include "wx/filename.h" #include "wx/tokenzr.h" +#include "wx/math.h" -#ifndef OFN_EXPLORER - #define OFN_EXPLORER 0x00080000 -#endif +#include "wx/msw/missing.h" // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- #ifdef __WIN32__ -# define wxMAXPATH 4096 +# define wxMAXPATH 65534 #else # define wxMAXPATH 1024 #endif @@ -70,149 +65,92 @@ # define wxMAXEXT 5 +// ---------------------------------------------------------------------------- +// globals +// ---------------------------------------------------------------------------- + +// standard dialog size +static wxRect gs_rectDialog(0, 0, 428, 266); + // ============================================================================ // implementation // ============================================================================ -// ---------------------------------------------------------------------------- -// wxWin macros -// ---------------------------------------------------------------------------- - -IMPLEMENT_CLASS(wxFileDialog, wxDialog) +IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase) // ---------------------------------------------------------------------------- -// global functions +// hook function for moving the dialog // ---------------------------------------------------------------------------- -wxString wxFileSelector(const wxChar *title, - const wxChar *defaultDir, - const wxChar *defaultFileName, - const wxChar *defaultExtension, - const wxChar *filter, - int flags, - wxWindow *parent, - int x, int y) +UINT APIENTRY +wxFileDialogHookFunction(HWND hDlg, + UINT iMsg, + WPARAM WXUNUSED(wParam), + LPARAM lParam) { - // In the original implementation, defaultExtension is passed to the - // lpstrDefExt member of OPENFILENAME. This extension, if non-NULL, is - // appended to the filename if the user fails to type an extension. The new - // implementation (taken from wxFileSelectorEx) appends the extension - // automatically, by looking at the filter specification. In fact this - // should be better than the native Microsoft implementation because - // Windows only allows *one* default extension, whereas here we do the - // right thing depending on the filter the user has chosen. - - // If there's a default extension specified but no filter, we create a - // suitable filter. - - wxString filter2; - if ( defaultExtension && !filter ) - filter2 = wxString(wxT("*.")) + defaultExtension; - else if ( filter ) - filter2 = filter; - - wxString defaultDirString; - if (defaultDir) - defaultDirString = defaultDir; - - wxString defaultFilenameString; - if (defaultFileName) - defaultFilenameString = defaultFileName; - - wxFileDialog fileDialog(parent, title, defaultDirString, - defaultFilenameString, filter2, - flags, wxPoint(x, y)); - if( wxStrlen(defaultExtension) != 0 ) + HWND hwndDialog; + hwndDialog = ::GetParent( hDlg ); + switch (iMsg) { - int filterFind = 0, - filterIndex = 0; - - for( unsigned int i = 0; i < filter2.Len(); i++ ) - { - if( filter2.GetChar(i) == wxT('|') ) + case WM_DESTROY: { - // save the start index of the new filter - unsigned int is = i++; - - // find the end of the filter - for( ; i < filter2.Len(); i++ ) - { - if(filter2[i] == wxT('|')) - break; - } + RECT dlgRect; + GetWindowRect( hwndDialog, & dlgRect ); + gs_rectDialog.x = dlgRect.left; + gs_rectDialog.y = dlgRect.top; + gs_rectDialog.width = dlgRect.right - dlgRect.left; + gs_rectDialog.height = dlgRect.bottom - dlgRect.top; + } + break; - if( i-is-1 > 0 && is+1 < filter2.Len() ) + case WM_NOTIFY: + { + OFNOTIFY * pNotifyCode; + pNotifyCode = (LPOFNOTIFY) lParam; + if (CDN_INITDONE == (pNotifyCode->hdr).code) { - if( filter2.Mid(is+1,i-is-1).Contains(defaultExtension) ) - { - filterFind = filterIndex; - break; - } - } - - filterIndex++; + SetWindowPos( hwndDialog, HWND_TOP, + gs_rectDialog.x, + gs_rectDialog.y, + gs_rectDialog.width, + gs_rectDialog.height, + SWP_NOZORDER|SWP_NOSIZE); + } } - } - - fileDialog.SetFilterIndex(filterFind); - } - - wxString filename; - if ( fileDialog.ShowModal() == wxID_OK ) - { - filename = fileDialog.GetPath(); + break; } - return filename; + // do the default processing + return 0; } +// ---------------------------------------------------------------------------- +// wxFileDialog +// ---------------------------------------------------------------------------- -wxString wxFileSelectorEx(const wxChar *title, - const wxChar *defaultDir, - const wxChar *defaultFileName, - int* defaultFilterIndex, - const wxChar *filter, - int flags, - wxWindow* parent, - int x, - int y) +wxFileDialog::wxFileDialog(wxWindow *parent, + const wxString& message, + const wxString& defaultDir, + const wxString& defaultFileName, + const wxString& wildCard, + long style, + const wxPoint& pos) + : wxFileDialogBase(parent, message, defaultDir, defaultFileName, + wildCard, style, pos) { - wxFileDialog fileDialog(parent, - title ? title : wxT(""), - defaultDir ? defaultDir : wxT(""), - defaultFileName ? defaultFileName : wxT(""), - filter ? filter : wxT(""), - flags, wxPoint(x, y)); - - wxString filename; - if ( fileDialog.ShowModal() == wxID_OK ) - { - if ( defaultFilterIndex ) - *defaultFilterIndex = fileDialog.GetFilterIndex(); + if ( ( m_dialogStyle & wxMULTIPLE ) && ( m_dialogStyle & wxSAVE ) ) + m_dialogStyle &= ~wxMULTIPLE; - filename = fileDialog.GetPath(); - } + m_bMovedWindow = false; - return filename; -} + // 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; -wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, - const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard, - long style, const wxPoint& WXUNUSED(pos)) -{ - m_message = message; - m_dialogStyle = style; - if ( ( m_dialogStyle & wxMULTIPLE ) && ( m_dialogStyle & wxSAVE ) ) - m_dialogStyle &= ~wxMULTIPLE; - m_parent = parent; - m_path = wxT(""); - m_fileName = defaultFileName; - m_dir = defaultDir; - m_wildCard = wildCard; - m_filterIndex = 0; } - void wxFileDialog::GetPaths(wxArrayString& paths) const { paths.Empty(); @@ -224,10 +162,54 @@ void wxFileDialog::GetPaths(wxArrayString& paths) const size_t count = m_fileNames.GetCount(); for ( size_t n = 0; n < count; n++ ) { - paths.Add(dir + m_fileNames[n]); + if (wxFileName(m_fileNames[n]).IsAbsolute()) + paths.Add(m_fileNames[n]); + else + paths.Add(dir + m_fileNames[n]); } } +void wxFileDialog::GetFilenames(wxArrayString& files) const +{ + files = m_fileNames; +} + +void wxFileDialog::SetPath(const wxString& path) +{ + wxString ext; + wxSplitPath(path, &m_dir, &m_fileName, &ext); + if ( !ext.empty() ) + m_fileName << _T('.') << ext; +} + +void wxFileDialog::DoGetPosition( int *x, int *y ) const +{ + *x = gs_rectDialog.x; + *y = gs_rectDialog.y; +} + + +void wxFileDialog::DoGetSize(int *width, int *height) const +{ + *width = gs_rectDialog.width; + *height = gs_rectDialog.height; +} + +void wxFileDialog::DoMoveWindow(int x, int y, int WXUNUSED(width), int WXUNUSED(height)) +{ + m_bMovedWindow = true; + + gs_rectDialog.x = x; + gs_rectDialog.y = y; + + /* + The width and height can not be set by the programmer + its just not possible. But the program can get the + size of the Dlg after it has been shown, in case they need + that data. + */ +} + int wxFileDialog::ShowModal() { HWND hWnd = 0; @@ -241,11 +223,36 @@ int wxFileDialog::ShowModal() *fileNameBuffer = wxT('\0'); *titleBuffer = wxT('\0'); +#if WXWIN_COMPATIBILITY_2_4 long msw_flags = 0; if ( (m_dialogStyle & wxHIDE_READONLY) || (m_dialogStyle & wxSAVE) ) msw_flags |= OFN_HIDEREADONLY; +#else + long msw_flags = OFN_HIDEREADONLY; +#endif + if ( m_dialogStyle & wxFILE_MUST_EXIST ) msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; + /* + If the window has been moved the programmer is probably + trying to center or position it. Thus we set the callback + or hook function so that we can actually adjust the position. + Without moving or centering the dlg, it will just stay + in the upper left of the frame, it does not center + automatically.. One additional note, when the hook is + enabled, the PLACES BAR in the dlg (shown on later versions + of windows (2000 and XP) will automatically be turned off + according to the MSDN docs. This is normal. If the + programmer needs the PLACES BAR (left side of dlg) they + just shouldn't move or center the dlg. + */ + if (m_bMovedWindow) // we need these flags. + { + msw_flags |= OFN_EXPLORER|OFN_ENABLEHOOK; +#ifndef __WXWINCE__ + msw_flags |= OFN_ENABLESIZING; +#endif + } if (m_dialogStyle & wxMULTIPLE ) { @@ -288,8 +295,8 @@ int wxFileDialog::ShowModal() // forward slashes) and also squeeze multiple consecutive slashes into one // as it doesn't like two backslashes in a row neither - wxString dir; - size_t i, len = m_dir.length(); + wxString dir; + size_t i, len = m_dir.length(); dir.reserve(len); for ( i = 0; i < len; i++ ) { @@ -309,8 +316,11 @@ int wxFileDialog::ShowModal() if ( chNext != _T('\\') && chNext != _T('/') ) break; - // ignore the next one - i++; + // ignore the next one, unless it is at the start of a UNC path + if (i > 0) + i++; + else + break; } // fall through @@ -323,38 +333,24 @@ int wxFileDialog::ShowModal() of.lpstrInitialDir = dir.c_str(); of.Flags = msw_flags; + of.lpfnHook = wxFileDialogHookFunction; + wxArrayString wildDescriptions, wildFilters; - //=== Like Alejandro Sierra's wildcard modification >>=================== - /* - In wxFileSelector you can put, instead of a single wild_card, - pairs of strings separated by '|'. - The first string is a description, and the - second is the wild card. You can put any number of pairs. - - eg. "description1 (*.ex1)|*.ex1|description2 (*.ex2)|*.ex2" + size_t items = wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters); - If you put a single wild card, it works as before the modification. - */ - //======================================================================= + wxASSERT_MSG( items > 0 , _T("empty wildcard list") ); - wxString theFilter; - if ( wxStrlen(m_wildCard) == 0 ) - theFilter = wxString(wxT("*.*")); - else - theFilter = m_wildCard ; wxString filterBuffer; - if ( !wxStrchr( theFilter, wxT('|') ) ) { // only one filter ==> default text - filterBuffer.Printf(_("Files (%s)|%s"), - theFilter.c_str(), theFilter.c_str()); - } - else { // more then one filter - filterBuffer = theFilter; - + for (i = 0; i < items ; i++) + { + filterBuffer += wildDescriptions[i]; + filterBuffer += wxT("|"); + filterBuffer += wildFilters[i]; + filterBuffer += wxT("|"); } - filterBuffer += wxT("|"); // Replace | with \0 for (i = 0; i < filterBuffer.Len(); i++ ) { if ( filterBuffer.GetChar(i) == wxT('|') ) { @@ -362,7 +358,7 @@ int wxFileDialog::ShowModal() } } - of.lpstrFilter = (LPTSTR)(const wxChar *)filterBuffer; + of.lpstrFilter = (LPTSTR)filterBuffer.c_str(); of.nFilterIndex = m_filterIndex + 1; //=== Setting defaultFileName >>========================================= @@ -373,6 +369,28 @@ int wxFileDialog::ShowModal() of.lpstrFile = fileNameBuffer; // holds returned filename of.nMaxFile = wxMAXPATH; + // we must set the default extension because otherwise Windows would check + // for the existing of a wrong file with wxOVERWRITE_PROMPT (i.e. if the + // 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_dialogStyle & wxSAVE) + { + 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; + + // use dummy name a to avoid assert in AppendExtension + defextBuffer = AppendExtension(wxT("a"), extension); + if (defextBuffer.StartsWith(wxT("a."))) + { + defextBuffer.Mid(2); + of.lpstrDefExt = defextBuffer.c_str(); + } + } + //== Execute FileDialog >>================================================= bool success = (m_dialogStyle & wxSAVE ? GetSaveFileName(&of) @@ -398,7 +416,7 @@ int wxFileDialog::ShowModal() : (GetOpenFileName(&of) != 0); } } -#endif +#endif // __WIN32__ if ( success ) { @@ -406,10 +424,11 @@ int wxFileDialog::ShowModal() if ( ( m_dialogStyle & wxMULTIPLE ) && #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; @@ -424,7 +443,7 @@ int wxFileDialog::ShowModal() i += wxStrlen(&fileNameBuffer[i]) + 1; } #else - wxStringTokenizer toke(fileNameBuffer, " \t\r\n"); + wxStringTokenizer toke(fileNameBuffer, _T(" \t\r\n")); m_dir = toke.GetNextToken(); m_fileName = toke.GetNextToken(); m_fileNames.Add(m_fileName); @@ -437,42 +456,28 @@ int wxFileDialog::ShowModal() if ( m_dir.Last() != _T('\\') ) dir += _T('\\'); - m_fileNames.Sort(); m_path = dir + m_fileName; + m_filterIndex = (int)of.nFilterIndex - 1; } else { - const wxChar* extension = NULL; - //=== Adding the correct extension >>================================= m_filterIndex = (int)of.nFilterIndex - 1; - if ( !of.nFileExtension || (of.nFileExtension && fileNameBuffer[ of.nFileExtension-1] != wxT('.')) ) - { // user has typed an filename - // without an extension: - - int maxFilter = (int)(of.nFilterIndex*2L-1L); - extension = filterBuffer; - - 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; + int maxFilter = (int)(of.nFilterIndex*2L) - 1; - extension = wxStrrchr( extension, wxT('.') ); - if ( extension // != "blabla" - && !wxStrrchr( extension, wxT('*') ) // != "blabla.*" - && !wxStrrchr( extension, wxT('?') ) // != "blabla.?" - && extension[1] // != "blabla." - && extension[1] != wxT(' ') ) // != "blabla. " - { - // now concat extension to the fileName: - m_fileName = wxString(fileNameBuffer) + extension; + for( int i = 0; i < maxFilter; i++ ) // get extension + extension = extension + wxStrlen( extension ) + 1; - int len = wxStrlen( fileNameBuffer ); - wxStrncpy( fileNameBuffer + len, extension, wxMAXPATH - len ); - fileNameBuffer[ wxMAXPATH -1 ] = wxT('\0'); - } + m_fileName = AppendExtension(fileNameBuffer, extension); + wxStrncpy(fileNameBuffer, m_fileName.c_str(), wxMin(m_fileName.Len(), wxMAXPATH-1)); + fileNameBuffer[wxMin(m_fileName.Len(), wxMAXPATH-1)] = wxT('\0'); } m_path = fileNameBuffer; @@ -500,50 +505,5 @@ int wxFileDialog::ShowModal() } -// Generic file load/save dialog (for internal use only) -static -wxString wxDefaultFileSelector(bool load, - const wxChar *what, - const wxChar *extension, - const wxChar *default_name, - wxWindow *parent) -{ - wxString prompt; - wxString str; - if (load) - str = _("Load %s file"); - else - str = _("Save %s file"); - prompt.Printf(str, what); - - const wxChar *ext = extension; - if (*ext == wxT('.')) - ext++; - - wxString wild; - wild.Printf(wxT("*.%s"), ext); - - return wxFileSelector(prompt, NULL, default_name, ext, wild, - load ? wxOPEN : wxSAVE, parent); -} - -// Generic file load dialog -WXDLLEXPORT wxString wxLoadFileSelector(const wxChar *what, - const wxChar *extension, - const wxChar *default_name, - wxWindow *parent) -{ - return wxDefaultFileSelector(TRUE, what, extension, default_name, parent); -} - -// Generic file save dialog -WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what, - const wxChar *extension, - const wxChar *default_name, - wxWindow *parent) -{ - return wxDefaultFileSelector(FALSE, what, extension, default_name, parent); -} - -#endif // wxUSE_FILEDLG +#endif // wxUSE_FILEDLG && !(__SMARTPHONE__ && __WXWINCE__)