X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff654490b7cb185631a1dc4621094d88643ccf41..f6669958924c3c3833e2932b65598b06073d2e65:/include/wx/filedlg.h diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index 86415900cf..e2a6bfd3da 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -19,6 +19,12 @@ #include "wx/dialog.h" #include "wx/arrstr.h" +// this symbol is defined for the platforms which support multiple +// ('|'-separated) filters in the file dialog +#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__) + #define wxHAS_MULTIPLE_FILEDLG_FILTERS +#endif + //---------------------------------------------------------------------------- // wxFileDialog data //---------------------------------------------------------------------------- @@ -58,15 +64,15 @@ enum #define wxFD_DEFAULT_STYLE wxFD_OPEN -extern WXDLLEXPORT_DATA(const wxChar) wxFileDialogNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxFileDialogNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorPromptStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorDefaultWildcardStr[]; //---------------------------------------------------------------------------- // wxFileDialogBase //---------------------------------------------------------------------------- -class WXDLLEXPORT wxFileDialogBase: public wxDialog +class WXDLLIMPEXP_CORE wxFileDialogBase: public wxDialog { public: wxFileDialogBase () { Init(); } @@ -85,6 +91,9 @@ public: Create(parent, message, defaultDir, defaultFile, wildCard, style, pos, sz, name); } + virtual ~wxFileDialogBase() {} + + bool Create(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, const wxString& defaultDir = wxEmptyString, @@ -98,9 +107,9 @@ public: bool HasFdFlag(int flag) const { return HasFlag(flag); } virtual void SetMessage(const wxString& message) { m_message = message; } - virtual void SetPath(const wxString& path) { m_path = path; } - virtual void SetDirectory(const wxString& dir) { m_dir = dir; } - virtual void SetFilename(const wxString& name) { m_fileName = name; } + virtual void SetPath(const wxString& path); + virtual void SetDirectory(const wxString& dir); + virtual void SetFilename(const wxString& name); virtual void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; } virtual void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; } @@ -113,6 +122,15 @@ public: virtual wxString GetWildcard() const { return m_wildCard; } virtual int GetFilterIndex() const { return m_filterIndex; } + // this function is called with wxFileDialog as parameter and should + // create the window containing the extra controls we want to show in it + typedef wxWindow *(*ExtraControlCreatorFunction)(wxWindow*); + + virtual bool SupportsExtraControl() const { return false; } + + bool SetExtraControlCreator(ExtraControlCreatorFunction creator); + wxWindow *GetExtraControl() const { return m_extraControl; } + // Utility functions #if WXWIN_COMPATIBILITY_2_6 @@ -137,19 +155,31 @@ protected: wxString m_fileName; wxString m_wildCard; int m_filterIndex; + wxWindow* m_extraControl; + + // returns true if control is created (if it already exists returns false) + bool CreateExtraControl(); + // return true if SetExtraControlCreator() was called + bool HasExtraControlCreator() const + { return m_extraControlCreator != NULL; } + // get the size of the extra control by creating and deleting it + wxSize GetExtraControlSize(); private: + ExtraControlCreatorFunction m_extraControlCreator; + void Init(); DECLARE_DYNAMIC_CLASS(wxFileDialogBase) - DECLARE_NO_COPY_CLASS(wxFileDialogBase) + wxDECLARE_NO_COPY_CLASS(wxFileDialogBase); }; + //---------------------------------------------------------------------------- // wxFileDialog convenience functions //---------------------------------------------------------------------------- // File selector - backward compatibility -WXDLLEXPORT wxString +WXDLLIMPEXP_CORE wxString wxFileSelector(const wxString& message = wxFileSelectorPromptStr, const wxString& default_path = wxEmptyString, const wxString& default_filename = wxEmptyString, @@ -160,7 +190,7 @@ wxFileSelector(const wxString& message = wxFileSelectorPromptStr, int x = wxDefaultCoord, int y = wxDefaultCoord); // An extended version of wxFileSelector -WXDLLEXPORT wxString +WXDLLIMPEXP_CORE wxString wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr, const wxString& default_path = wxEmptyString, const wxString& default_filename = wxEmptyString, @@ -171,14 +201,14 @@ wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr, int x = wxDefaultCoord, int y = wxDefaultCoord); // Ask for filename to load -WXDLLEXPORT wxString +WXDLLIMPEXP_CORE wxString wxLoadFileSelector(const wxString& what, const wxString& extension, const wxString& default_name = wxEmptyString, wxWindow *parent = NULL); // Ask for filename to save -WXDLLEXPORT wxString +WXDLLIMPEXP_CORE wxString wxSaveFileSelector(const wxString& what, const wxString& extension, const wxString& default_name = wxEmptyString, @@ -197,7 +227,7 @@ wxSaveFileSelector(const wxString& what, #elif defined(__WXGTK__) #include "wx/gtk1/filedlg.h" #elif defined(__WXMAC__) - #include "wx/mac/filedlg.h" + #include "wx/osx/filedlg.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/filedlg.h" #elif defined(__WXPM__)