X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1be7a35c5ec31b6cfcab9d969c7969586441a945..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/filedlg.h?ds=sidebyside diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index df18f4be1b..b8384d3e83 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: filedlg.h +// Name: wx/filedlg.h // Purpose: wxFileDialog base header // Author: Robert Roebling // Modified by: @@ -23,19 +23,42 @@ // wxFileDialog data //---------------------------------------------------------------------------- +/* + The flags below must coexist with the following flags in m_windowStyle + #define wxCAPTION 0x20000000 + #define wxMAXIMIZE 0x00002000 + #define wxCLOSE_BOX 0x00001000 + #define wxSYSTEM_MENU 0x00000800 + wxBORDER_NONE = 0x00200000 + #define wxRESIZE_BORDER 0x00000040 +*/ + enum { - wxOPEN = 0x0001, - wxSAVE = 0x0002, - wxOVERWRITE_PROMPT = 0x0004, -#if WXWIN_COMPATIBILITY_2_4 - wxHIDE_READONLY = 0x0008, -#endif - wxFILE_MUST_EXIST = 0x0010, - wxMULTIPLE = 0x0020, - wxCHANGE_DIR = 0x0040 + wxFD_OPEN = 0x0001, + wxFD_SAVE = 0x0002, + wxFD_OVERWRITE_PROMPT = 0x0004, + wxFD_FILE_MUST_EXIST = 0x0010, + wxFD_MULTIPLE = 0x0020, + wxFD_CHANGE_DIR = 0x0080, + wxFD_PREVIEW = 0x0100 +}; + +#if WXWIN_COMPATIBILITY_2_6 +enum +{ + wxOPEN = wxFD_OPEN, + wxSAVE = wxFD_SAVE, + wxOVERWRITE_PROMPT = wxFD_OVERWRITE_PROMPT, + wxFILE_MUST_EXIST = wxFD_FILE_MUST_EXIST, + wxMULTIPLE = wxFD_MULTIPLE, + wxCHANGE_DIR = wxFD_CHANGE_DIR }; +#endif + +#define wxFD_DEFAULT_STYLE wxFD_OPEN +extern WXDLLEXPORT_DATA(const wxChar) wxFileDialogNameStr[]; extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[]; extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[]; @@ -53,11 +76,13 @@ public: const wxString& defaultDir = wxEmptyString, const wxString& defaultFile = wxEmptyString, const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = 0, - const wxPoint& pos = wxDefaultPosition) : wxDialog() + long style = wxFD_DEFAULT_STYLE, + const wxPoint& pos = wxDefaultPosition, + const wxSize& sz = wxDefaultSize, + const wxString& name = wxFileDialogNameStr) { Init(); - Create(parent, message, defaultDir, defaultFile, wildCard, style, pos); + Create(parent, message, defaultDir, defaultFile, wildCard, style, pos, sz, name); } bool Create(wxWindow *parent, @@ -65,15 +90,18 @@ public: const wxString& defaultDir = wxEmptyString, const wxString& defaultFile = wxEmptyString, const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = 0, - const wxPoint& pos = wxDefaultPosition); + long style = wxFD_DEFAULT_STYLE, + const wxPoint& pos = wxDefaultPosition, + const wxSize& sz = wxDefaultSize, + const wxString& name = wxFileDialogNameStr); + + 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 SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; } - virtual void SetStyle(long style) { m_dialogStyle = style; } virtual void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; } virtual wxString GetMessage() const { return m_message; } @@ -83,21 +111,17 @@ public: virtual wxString GetFilename() const { return m_fileName; } virtual void GetFilenames(wxArrayString& files) const { files.Empty(); files.Add(m_fileName); } virtual wxString GetWildcard() const { return m_wildCard; } - virtual long GetStyle() const { return m_dialogStyle; } virtual int GetFilterIndex() const { return m_filterIndex; } // Utility functions -#if WXWIN_COMPATIBILITY_2_4 - // Parses the wildCard, returning the number of filters. - // Returns 0 if none or if there's a problem, - // The arrays will contain an equal number of items found before the error. - // wildCard is in the form: - // "All files (*)|*|Image Files (*.jpeg *.png)|*.jpg;*.png" - wxDEPRECATED( static int ParseWildcard(const wxString& wildCard, - wxArrayString& descriptions, - wxArrayString& filters) ); -#endif // WXWIN_COMPATIBILITY_2_4 +#if WXWIN_COMPATIBILITY_2_6 + + wxDEPRECATED( long GetStyle() const ); + wxDEPRECATED( void SetStyle(long style) ); + +#endif // WXWIN_COMPATIBILITY_2_6 + // Append first extension to filePath from a ';' separated extensionList // if filePath = "path/foo.bar" just return it as is @@ -108,7 +132,6 @@ public: protected: wxString m_message; - long m_dialogStyle; wxString m_dir; wxString m_path; // Full path wxString m_fileName; @@ -127,61 +150,61 @@ private: // File selector - backward compatibility WXDLLEXPORT wxString -wxFileSelector(const wxChar *message = wxFileSelectorPromptStr, - const wxChar *default_path = NULL, - const wxChar *default_filename = NULL, - const wxChar *default_extension = NULL, - const wxChar *wildcard = wxFileSelectorDefaultWildcardStr, +wxFileSelector(const wxString& message = wxFileSelectorPromptStr, + const wxString& default_path = wxEmptyString, + const wxString& default_filename = wxEmptyString, + const wxString& default_extension = wxEmptyString, + const wxString& wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0, wxWindow *parent = NULL, int x = wxDefaultCoord, int y = wxDefaultCoord); // An extended version of wxFileSelector WXDLLEXPORT wxString -wxFileSelectorEx(const wxChar *message = wxFileSelectorPromptStr, - const wxChar *default_path = NULL, - const wxChar *default_filename = NULL, +wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr, + const wxString& default_path = wxEmptyString, + const wxString& default_filename = wxEmptyString, int *indexDefaultExtension = NULL, - const wxChar *wildcard = wxFileSelectorDefaultWildcardStr, + const wxString& wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0, wxWindow *parent = NULL, int x = wxDefaultCoord, int y = wxDefaultCoord); // Ask for filename to load WXDLLEXPORT wxString -wxLoadFileSelector(const wxChar *what, - const wxChar *extension, - const wxChar *default_name = (const wxChar *)NULL, - wxWindow *parent = (wxWindow *) NULL); +wxLoadFileSelector(const wxString& what, + const wxString& extension, + const wxString& default_name = wxEmptyString, + wxWindow *parent = NULL); // Ask for filename to save WXDLLEXPORT wxString -wxSaveFileSelector(const wxChar *what, - const wxChar *extension, - const wxChar *default_name = (const wxChar *) NULL, - wxWindow *parent = (wxWindow *) NULL); +wxSaveFileSelector(const wxString& what, + const wxString& extension, + const wxString& default_name = wxEmptyString, + wxWindow *parent = NULL); #if defined (__WXUNIVERSAL__) -#include "wx/generic/filedlgg.h" + #define wxHAS_GENERIC_FILEDIALOG + #include "wx/generic/filedlgg.h" #elif defined(__WXMSW__) -#include "wx/msw/filedlg.h" + #include "wx/msw/filedlg.h" #elif defined(__WXMOTIF__) -#include "wx/motif/filedlg.h" + #include "wx/motif/filedlg.h" +#elif defined(__WXGTK24__) + #include "wx/gtk/filedlg.h" // GTK+ > 2.4 has native version #elif defined(__WXGTK20__) -#include "wx/gtk/filedlg.h" + #define wxHAS_GENERIC_FILEDIALOG + #include "wx/generic/filedlgg.h" #elif defined(__WXGTK__) -#include "wx/generic/filedlgg.h" -#elif defined(__WXX11__) -#include "wx/generic/filedlgg.h" -#elif defined(__WXMGL__) -#include "wx/generic/filedlgg.h" + #include "wx/gtk1/filedlg.h" #elif defined(__WXMAC__) -#include "wx/mac/filedlg.h" + #include "wx/mac/filedlg.h" #elif defined(__WXCOCOA__) -#include "wx/cocoa/filedlg.h" + #include "wx/cocoa/filedlg.h" #elif defined(__WXPM__) -#include "wx/os2/filedlg.h" + #include "wx/os2/filedlg.h" #endif #endif // wxUSE_FILEDLG