X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/21d124e03c63546b52b5830fd593d4e9b8d69cbf..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/filepicker.h diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h index b4f12513eb..8060a3f8dd 100644 --- a/include/wx/filepicker.h +++ b/include/wx/filepicker.h @@ -17,19 +17,20 @@ #if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL #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[]; // ---------------------------------------------------------------------------- @@ -215,6 +216,11 @@ public: validator, name); } + void SetFileName(const wxFileName &filename) + { SetPath(filename.GetFullPath()); } + + wxFileName GetFileName() const + { return wxFileName(GetPath()); } public: // overrides @@ -307,6 +313,11 @@ public: ); } + void SetDirName(const wxFileName &dirname) + { SetPath(dirname.GetPath()); } + + wxFileName GetDirName() const + { return wxFileName::DirName(GetPath()); } public: // overrides