X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a62848fdba49396eba4f52c037d2dc82130274b4..1721a8c028d3b6a553634c632117fbfac102a30e:/include/wx/filedlg.h diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index 9d7cb7d30a..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__) @@ -167,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