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

only allow selecting existing files in wxLoadFileSelector; use this function instead of wxFileSelector in the samples (closes #10693)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-06-12 18:02:57 +00:00
parent 0d14e4f21d
commit f2a18fbec6
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changes.txt
View File

@@ -122,6 +122,8 @@ Changes in behaviour not resulting in compilation errors, please read this!
or equivalent function should now be done into wxApp::OnEventLoopEnter(). or equivalent function should now be done into wxApp::OnEventLoopEnter().
See wxApp::OnEventLoopEnter() and wxApp::OnEventLoopExit() docs for more info. See wxApp::OnEventLoopEnter() and wxApp::OnEventLoopExit() docs for more info.
- wxLoadFileSelector() now allows the user to select existing files only.
Changes in behaviour which may result in compilation errors Changes in behaviour which may result in compilation errors
----------------------------------------------------------- -----------------------------------------------------------

4
samples/image/image.cpp
View File

@@ -687,7 +687,7 @@ wxString MyFrame::LoadUserImage(wxImage& image)
wxString filename; wxString filename;
#if wxUSE_FILEDLG #if wxUSE_FILEDLG
filename = wxFileSelector(_T("Select image file")); filename = wxLoadFileSelector(_T("image"), wxEmptyString);
if ( !filename.empty() ) if ( !filename.empty() )
{ {
if ( !image.LoadFile(filename) ) if ( !image.LoadFile(filename) )
@@ -796,7 +796,7 @@ void MyFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnThumbnail( wxCommandEvent &WXUNUSED(event) ) void MyFrame::OnThumbnail( wxCommandEvent &WXUNUSED(event) )
{ {
#if wxUSE_FILEDLG #if wxUSE_FILEDLG
wxString filename = wxFileSelector(_T("Select image file")); wxString filename = wxLoadFileSelector(_T("image"), wxEmptyString, wxEmptyString, this);
if ( filename.empty() ) if ( filename.empty() )
return; return;

2
samples/toolbar/toolbar.cpp
View File

@@ -958,7 +958,7 @@ void MyFrame::OnToolbarBgCol(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnToolbarCustomBitmap(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnToolbarCustomBitmap(wxCommandEvent& WXUNUSED(event))
{ {
m_pathBmp = wxFileSelector(_T("Custom bitmap path")); m_pathBmp = wxLoadFileSelector(_T("custom bitmap"));
RecreateToolbar(); RecreateToolbar();
} }

5
samples/widgets/bmpcombobox.cpp
View File

@@ -882,12 +882,9 @@ wxBitmap BitmapComboBoxWidgetsPage::LoadBitmap(const wxString& WXUNUSED(filepath
wxBitmap BitmapComboBoxWidgetsPage::QueryBitmap(wxString* pStr) wxBitmap BitmapComboBoxWidgetsPage::QueryBitmap(wxString* pStr)
{ {
wxString filepath = wxFileSelector(wxT("Choose image file"), wxString filepath = wxLoadFileSelector(wxT("image"),
wxEmptyString, wxEmptyString,
wxEmptyString, wxEmptyString,
wxEmptyString,
wxT("*.*"),
wxFD_OPEN | wxFD_FILE_MUST_EXIST,
this); this);
wxBitmap bitmap; wxBitmap bitmap;

3
src/common/fldlgcmn.cpp
View File

@@ -313,7 +313,8 @@ static wxString wxDefaultFileSelector(bool load,
} }
return wxFileSelector(prompt, wxEmptyString, default_name, ext, wild, return wxFileSelector(prompt, wxEmptyString, default_name, ext, wild,
load ? wxFD_OPEN : wxFD_SAVE, parent); load ? (wxFD_OPEN | wxFD_FILE_MUST_EXIST) : wxFD_SAVE,
parent);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------