X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/398eebb155b2a5804359a0f40935e75424e169e2..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/generic/filedlgg.h?ds=sidebyside diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h index 239eea1072..b4f35b3afd 100644 --- a/include/wx/generic/filedlgg.h +++ b/include/wx/generic/filedlgg.h @@ -15,6 +15,7 @@ #include "wx/listctrl.h" #include "wx/datetime.h" #include "wx/filefn.h" +#include "wx/artprov.h" #include "wx/filedlg.h" #include "wx/generic/filectrlg.h" @@ -31,7 +32,7 @@ class WXDLLIMPEXP_FWD_CORE wxFileCtrlEvent; // wxGenericFileDialog //------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericFileDialog: public wxFileDialogBase +class WXDLLIMPEXP_CORE wxGenericFileDialog: public wxFileDialogBase { public: wxGenericFileDialog() : wxFileDialogBase() { Init(); } @@ -60,6 +61,10 @@ public: virtual ~wxGenericFileDialog(); + virtual void SetDirectory(const wxString& dir) + { m_filectrl->SetDirectory(dir); } + virtual void SetFilename(const wxString& name) + { m_filectrl->SetFilename(name); } virtual void SetMessage(const wxString& message) { SetTitle(message); } virtual void SetPath(const wxString& path) { m_filectrl->SetPath(path); } @@ -71,17 +76,18 @@ public: virtual wxString GetPath() const { return m_filectrl->GetPath(); } virtual void GetPaths(wxArrayString& paths) const - { return m_filectrl->GetPaths(paths); } + { m_filectrl->GetPaths(paths); } virtual wxString GetDirectory() const { return m_filectrl->GetDirectory(); } virtual wxString GetFilename() const { return m_filectrl->GetFilename(); } virtual void GetFilenames(wxArrayString& files) const - { return m_filectrl->GetFilenames(files); } + { m_filectrl->GetFilenames(files); } virtual wxString GetWildcard() const { return m_filectrl->GetWildcard(); } virtual int GetFilterIndex() const { return m_filectrl->GetFilterIndex(); } + virtual bool SupportsExtraControl() const { return true; } // implementation only from now on // ------------------------------- @@ -113,6 +119,8 @@ protected: private: void Init(); + wxBitmapButton* AddBitmapButton( wxWindowID winId, const wxArtID& artId, + const wxString& tip, wxSizer *sizer ); DECLARE_DYNAMIC_CLASS(wxGenericFileDialog) DECLARE_EVENT_TABLE() @@ -124,10 +132,10 @@ private: #ifdef wxHAS_GENERIC_FILEDIALOG -class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog +class WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog { public: - wxFileDialog() {} + wxFileDialog() {} wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, @@ -135,8 +143,12 @@ public: const wxString& defaultFile = wxEmptyString, const wxString& wildCard = wxFileSelectorDefaultWildcardStr, long style = 0, - const wxPoint& pos = wxDefaultPosition) - :wxGenericFileDialog(parent, message, defaultDir, defaultFile, wildCard, style, pos) + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize) + :wxGenericFileDialog(parent, message, + defaultDir, defaultFile, wildCard, + style, + pos, size) { }