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

fixed wxfileDialog::SetPath() (which didn't do anything before)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-10-05 20:20:57 +00:00
parent d4ffadcd7c
commit 8ce31375f2
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/msw/filedlg.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: filedlg.h // Name: wx/msw/filedlg.h
// Purpose: wxFileDialog class // Purpose: wxFileDialog class
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
@@ -28,12 +28,16 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorDefaultWildcardStr;
class WXDLLEXPORT wxFileDialog: public wxDialog class WXDLLEXPORT wxFileDialog: public wxDialog
{ {
public: public:
wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, wxFileDialog(wxWindow *parent,
const wxString& defaultDir = wxEmptyString, const wxString& defaultFile = wxEmptyString, const wxString& wildCard = wxFileSelectorDefaultWildcardStr, const wxString& message = wxFileSelectorPromptStr,
long style = 0, const wxPoint& pos = wxDefaultPosition); const wxString& defaultDir = wxEmptyString,
const wxString& defaultFile = wxEmptyString,
const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
long style = 0,
const wxPoint& pos = wxDefaultPosition);
void SetMessage(const wxString& message) { m_message = message; } void SetMessage(const wxString& message) { m_message = message; }
void SetPath(const wxString& path) { m_path = path; } void SetPath(const wxString& path);
void SetDirectory(const wxString& dir) { m_dir = dir; } void SetDirectory(const wxString& dir) { m_dir = dir; }
void SetFilename(const wxString& name) { m_fileName = name; } void SetFilename(const wxString& name) { m_fileName = name; }
void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; } void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; }
@@ -50,7 +54,7 @@ public:
long GetStyle() const { return m_dialogStyle; } long GetStyle() const { return m_dialogStyle; }
int GetFilterIndex() const { return m_filterIndex ; } int GetFilterIndex() const { return m_filterIndex ; }
int ShowModal(); virtual int ShowModal();
protected: protected:
wxString m_message; wxString m_message;

19
src/msw/filedlg.cpp
View File

@@ -35,6 +35,7 @@
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/filedlg.h" #include "wx/filedlg.h"
#include "wx/filefn.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/app.h" #include "wx/app.h"
@@ -197,9 +198,13 @@ wxString wxFileSelectorEx(const wxChar *title,
return filename; return filename;
} }
wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, wxFileDialog::wxFileDialog(wxWindow *parent,
const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard, const wxString& message,
long style, const wxPoint& WXUNUSED(pos)) const wxString& defaultDir,
const wxString& defaultFileName,
const wxString& wildCard,
long style,
const wxPoint& WXUNUSED(pos))
{ {
m_message = message; m_message = message;
m_dialogStyle = style; m_dialogStyle = style;
@@ -228,6 +233,14 @@ void wxFileDialog::GetPaths(wxArrayString& paths) const
} }
} }
void wxFileDialog::SetPath(const wxString& path)
{
wxString ext;
wxSplitPath(path, &m_dir, &m_fileName, &ext);
if ( !ext.empty() )
m_fileName << _T('.') << ext;
}
int wxFileDialog::ShowModal() int wxFileDialog::ShowModal()
{ {
HWND hWnd = 0; HWND hWnd = 0;