Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't prepend directory to filename for shortcuts

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-05-18 09:20:42 +00:00
parent a1fea40ec6
commit 8ad9ca97bb
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/latex/wx/filedlg.tex
View File

@@ -118,6 +118,11 @@ Fills the array {\it filenames} with the names of the files chosen. This
function should only be used with the dialogs which have {\tt wxMULTIPLE} style, function should only be used with the dialogs which have {\tt wxMULTIPLE} style,
use \helpref{GetFilename}{wxfiledialoggetfilename} for the others. use \helpref{GetFilename}{wxfiledialoggetfilename} for the others.
Note that under Windows, if the user selects shortcuts, the filenames
include paths, since the application cannot determine the full path
of each referenced file by appending the directory containing the shortcuts
to the filename.
\membersection{wxFileDialog::GetFilterIndex}\label{wxfiledialoggetfilterindex} \membersection{wxFileDialog::GetFilterIndex}\label{wxfiledialoggetfilterindex}
\constfunc{int}{GetFilterIndex}{\void} \constfunc{int}{GetFilterIndex}{\void}

6
src/msw/filedlg.cpp
View File

@@ -51,6 +51,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "wx/filename.h"
#include "wx/tokenzr.h" #include "wx/tokenzr.h"
#ifndef OFN_EXPLORER #ifndef OFN_EXPLORER
@@ -229,7 +230,10 @@ void wxFileDialog::GetPaths(wxArrayString& paths) const
size_t count = m_fileNames.GetCount(); size_t count = m_fileNames.GetCount();
for ( size_t n = 0; n < count; n++ ) 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]);
} }
} }