X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cf3e587a2ec542ba1eb6e03a84c54edefae1881..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/filedlg.h diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index b8384d3e83..afe838b461 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -58,9 +58,9 @@ enum #define wxFD_DEFAULT_STYLE wxFD_OPEN -extern WXDLLEXPORT_DATA(const wxChar) wxFileDialogNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[]; +extern WXDLLEXPORT_DATA(const char) wxFileDialogNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[]; +extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[]; //---------------------------------------------------------------------------- // wxFileDialogBase @@ -192,11 +192,8 @@ wxSaveFileSelector(const wxString& what, #include "wx/msw/filedlg.h" #elif defined(__WXMOTIF__) #include "wx/motif/filedlg.h" -#elif defined(__WXGTK24__) - #include "wx/gtk/filedlg.h" // GTK+ > 2.4 has native version #elif defined(__WXGTK20__) - #define wxHAS_GENERIC_FILEDIALOG - #include "wx/generic/filedlgg.h" + #include "wx/gtk/filedlg.h" // GTK+ > 2.4 has native version #elif defined(__WXGTK__) #include "wx/gtk1/filedlg.h" #elif defined(__WXMAC__)