X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/21416306cb462782b3421ff483a88813c130dfb0..f4430b188929c247408bf14ab70681a080b41675:/include/wx/filedlg.h diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index 23eccc3bc7..3b4de90118 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -78,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. @@ -86,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 @@ -122,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 @@ -133,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 @@ -157,7 +159,7 @@ wxSaveFileSelector(const wxChar *what, #elif defined(__WXMOTIF__) #include "wx/motif/filedlg.h" #elif defined(__WXGTK__) -#include "wx/generic/filedlgg.h" +#include "wx/gtk/filedlg.h" #elif defined(__WXX11__) #include "wx/generic/filedlgg.h" #elif defined(__WXMGL__) @@ -165,7 +167,7 @@ wxSaveFileSelector(const wxChar *what, #elif defined(__WXMAC__) #include "wx/mac/filedlg.h" #elif defined(__WXCOCOA__) -#include "wx/generic/filedlgg.h" +#include "wx/cocoa/filedlg.h" #elif defined(__WXPM__) #include "wx/os2/filedlg.h" #endif