X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3218cf580bf2249f20748aad4f78e339cf5fa02f..edb8f2985fc838f92c60d9efd42462441f3caea9:/include/wx/gtk1/filedlg.h diff --git a/include/wx/gtk1/filedlg.h b/include/wx/gtk1/filedlg.h index 2536277dc0..200d5c3dde 100644 --- a/include/wx/gtk1/filedlg.h +++ b/include/wx/gtk1/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() { } @@ -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