X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/28f15a1f70e45c276740c70c518efd03fcd1c227..50ccc908dc4e6376de91edd7f74018898fd690b1:/include/wx/filepicker.h diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h index 8423c65f26..33667cd459 100644 --- a/include/wx/filepicker.h +++ b/include/wx/filepicker.h @@ -19,18 +19,18 @@ #include "wx/pickerbase.h" #include "wx/filename.h" -class WXDLLIMPEXP_CORE wxDialog; -class WXDLLIMPEXP_CORE wxFileDirPickerEvent; +class WXDLLIMPEXP_FWD_CORE wxDialog; +class WXDLLIMPEXP_FWD_CORE wxFileDirPickerEvent; -extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerWidgetLabel[]; -extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerWidgetNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerCtrlNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[]; +extern WXDLLEXPORT_DATA(const char) wxFilePickerWidgetLabel[]; +extern WXDLLEXPORT_DATA(const char) wxFilePickerWidgetNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxFilePickerCtrlNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxDirPickerWidgetLabel[]; -extern WXDLLEXPORT_DATA(const wxChar) wxDirPickerWidgetNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxDirPickerCtrlNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[]; +extern WXDLLEXPORT_DATA(const char) wxDirPickerWidgetLabel[]; +extern WXDLLEXPORT_DATA(const char) wxDirPickerWidgetNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxDirPickerCtrlNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[]; // ---------------------------------------------------------------------------- @@ -243,7 +243,7 @@ protected: const wxString& wildcard) { return new wxFilePickerWidget(parent, wxID_ANY, - wxFilePickerWidgetLabel, + wxGetTranslation(wxFilePickerWidgetLabel), path, message, wildcard, wxDefaultPosition, wxDefaultSize, GetPickerStyle(GetWindowStyle())); @@ -337,7 +337,8 @@ protected: const wxString& message, const wxString& WXUNUSED(wildcard)) { - return new wxDirPickerWidget(parent, wxID_ANY, wxDirPickerWidgetLabel, + return new wxDirPickerWidget(parent, wxID_ANY, + wxGetTranslation(wxDirPickerWidgetLabel), path, message, wxDefaultPosition, wxDefaultSize, GetPickerStyle(GetWindowStyle()));