X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c330a2cf9369d3ae2bdb3bd67e995517288b353d..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk1/filedlg.h diff --git a/include/wx/gtk1/filedlg.h b/include/wx/gtk1/filedlg.h index 641c056762..db117cfe23 100644 --- a/include/wx/gtk1/filedlg.h +++ b/include/wx/gtk1/filedlg.h @@ -11,7 +11,7 @@ #ifndef __GTKFILEDLGH__ #define __GTKFILEDLGH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -21,45 +21,39 @@ // 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) - - friend void gtk_filedialog_ok_callback( GtkWidget *widget, gpointer data ); - - public: - - wxFileDialog() {}; - - wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = "", const wxString& defaultFile = "", - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = 0, const wxPoint& pos = wxDefaultPosition); - - inline void SetMessage(const wxString& message) { m_message = message; } - inline void SetPath(const wxString& path) { m_path = path; } - inline void SetDirectory(const wxString& dir) { m_dir = dir; } - inline void SetFilename(const wxString& name) { m_fileName = name; } - inline void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; } - inline void SetStyle(long style) { m_dialogStyle = style; } - inline void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; } - - inline wxString GetMessage(void) const { return m_message; } - inline wxString GetPath(void) const { return m_path; } - inline wxString GetDirectory(void) const { return m_dir; } - inline wxString GetFilename(void) const { return m_fileName; } - inline wxString GetWildcard(void) const { return m_wildCard; } - inline long GetStyle(void) const { return m_dialogStyle; } - inline int GetFilterIndex(void) const { return m_filterIndex ; } - - int ShowModal(void); - - protected: - +public: + wxFileDialog() { } + + wxFileDialog(wxWindow *parent, + const wxString& message = wxFileSelectorPromptStr, + const wxString& defaultDir = "", + const wxString& defaultFile = "", + const wxString& wildCard = wxFileSelectorDefaultWildcardStr, + long style = 0, + const wxPoint& pos = wxDefaultPosition); + + void SetMessage(const wxString& message) { m_message = message; } + 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; } + void SetStyle(long style) { m_dialogStyle = style; } + void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; } + + wxString GetMessage() const { return m_message; } + wxString GetPath() const { return m_path; } + wxString GetDirectory() const { return m_dir; } + wxString GetFilename() const { return m_fileName; } + wxString GetWildcard() const { return m_wildCard; } + long GetStyle() const { return m_dialogStyle; } + int GetFilterIndex() const { return m_filterIndex ; } + +protected: wxString m_message; long m_dialogStyle; wxWindow * m_parent; @@ -68,6 +62,9 @@ class wxFileDialog: public wxDialog wxString m_fileName; wxString m_wildCard; int m_filterIndex; + +private: + DECLARE_DYNAMIC_CLASS(wxFileDialog) }; #define wxOPEN 1 @@ -78,38 +75,38 @@ class wxFileDialog: public wxDialog // 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