X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2748d25157097ce4126afcf5052315b368bfbc44..bb84929ec5b27eae5433982703dd6d0df89bfc2d:/include/wx/gtk/filedlg.h diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h index ad07d0736e..200d5c3dde 100644 --- a/include/wx/gtk/filedlg.h +++ b/include/wx/gtk/filedlg.h @@ -21,13 +21,11 @@ // File selector //------------------------------------------------------------------------- -extern const char *wxFileSelectorPromptStr; -extern const char *wxFileSelectorDefaultWildcardStr; +extern const wxChar *wxFileSelectorPromptStr; +extern const wxChar *wxFileSelectorDefaultWildcardStr; class wxFileDialog: public wxDialog { -DECLARE_DYNAMIC_CLASS(wxFileDialog) - public: wxFileDialog() { } @@ -40,7 +38,7 @@ public: const wxPoint& pos = wxDefaultPosition); void SetMessage(const wxString& message) { m_message = message; } - void SetPath(const wxString& path) { m_path = path; } + void SetPath(const wxString& path); void SetDirectory(const wxString& dir) { m_dir = dir; } void SetFilename(const wxString& name) { m_fileName = name; } void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; } @@ -56,7 +54,6 @@ public: int GetFilterIndex() const { return m_filterIndex ; } protected: - wxString m_message; long m_dialogStyle; wxWindow * m_parent; @@ -65,6 +62,9 @@ protected: wxString m_fileName; wxString m_wildCard; int m_filterIndex; + +private: + DECLARE_DYNAMIC_CLASS(wxFileDialog) }; #define wxOPEN 1 @@ -75,38 +75,38 @@ protected: // File selector - backward compatibility WXDLLEXPORT wxString -wxFileSelector(const char *message = wxFileSelectorPromptStr, - const char *default_path = NULL, - const char *default_filename = NULL, - const char *default_extension = NULL, - const char *wildcard = wxFileSelectorDefaultWildcardStr, +wxFileSelector(const wxChar *message = wxFileSelectorPromptStr, + const wxChar *default_path = NULL, + const wxChar *default_filename = NULL, + const wxChar *default_extension = NULL, + const wxChar *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0, wxWindow *parent = NULL, int x = -1, int y = -1); // An extended version of wxFileSelector WXDLLEXPORT wxString -wxFileSelectorEx(const char *message = wxFileSelectorPromptStr, - const char *default_path = NULL, - const char *default_filename = NULL, +wxFileSelectorEx(const wxChar *message = wxFileSelectorPromptStr, + const wxChar *default_path = NULL, + const wxChar *default_filename = NULL, int *indexDefaultExtension = NULL, - const char *wildcard = wxFileSelectorDefaultWildcardStr, + const wxChar *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0, wxWindow *parent = NULL, int x = -1, int y = -1); // Ask for filename to load WXDLLEXPORT wxString -wxLoadFileSelector(const char *what, - const char *extension, - const char *default_name = (const char *)NULL, +wxLoadFileSelector(const wxChar *what, + const wxChar *extension, + const wxChar *default_name = (const wxChar *)NULL, wxWindow *parent = (wxWindow *) NULL); // Ask for filename to save WXDLLEXPORT wxString -wxSaveFileSelector(const char *what, - const char *extension, - const char *default_name = (const char *) NULL, +wxSaveFileSelector(const wxChar *what, + const wxChar *extension, + const wxChar *default_name = (const wxChar *) NULL, wxWindow *parent = (wxWindow *) NULL); #endif