X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..d6e6a35c801690a6456a85331c7f56fe04999c6f:/include/wx/filedlg.h diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index afcffa03b8..9d7cb7d30a 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -30,7 +30,9 @@ 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 @@ -76,6 +78,7 @@ public: // 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. @@ -84,6 +87,7 @@ public: static int ParseWildcard(const wxString& wildCard, wxArrayString& descriptions, wxArrayString& filters); +#endif // WXWIN_COMPATIBILITY_2_4 // Append first extension to filePath from a ';' separated extensionList // if filePath = "path/foo.bar" just return it as is @@ -120,7 +124,7 @@ wxFileSelector(const wxChar *message = wxFileSelectorPromptStr, const wxChar *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0, wxWindow *parent = NULL, - int x = -1, int y = -1); + int x = wxDefaultCoord, int y = wxDefaultCoord); // An extended version of wxFileSelector WXDLLEXPORT wxString @@ -131,7 +135,7 @@ wxFileSelectorEx(const wxChar *message = wxFileSelectorPromptStr, const wxChar *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0, wxWindow *parent = NULL, - int x = -1, int y = -1); + int x = wxDefaultCoord, int y = wxDefaultCoord); // Ask for filename to load WXDLLEXPORT wxString