X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f31424dbe95971e8ac8ccf9f11cd79afe19485ea..e4e84ccdb69bff1b2580a6b685c7a51559388364:/include/wx/filedlg.h diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index 0b83e13601..2a1892ecde 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -38,8 +38,8 @@ enum wxCHANGE_DIR = 0x0040 }; -WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorDefaultWildcardStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxFileSelectorPromptStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxFileSelectorDefaultWildcardStr; //---------------------------------------------------------------------------- // wxFileDialogBase @@ -84,9 +84,9 @@ public: // 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" - static int ParseWildcard(const wxString& wildCard, - wxArrayString& descriptions, - wxArrayString& filters); + wxDEPRECATED( static int ParseWildcard(const wxString& wildCard, + wxArrayString& descriptions, + wxArrayString& filters) ); #endif // WXWIN_COMPATIBILITY_2_4 // Append first extension to filePath from a ';' separated extensionList @@ -159,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__)