From e97f6ab64ef2e1e3839114d95ad6b60b7ac5bd27 Mon Sep 17 00:00:00 2001 From: Ove Kaaven Date: Mon, 19 Apr 1999 18:23:09 +0000 Subject: [PATCH] More wxChar conversion git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/dirdlg.h | 2 +- include/wx/msw/filedlg.h | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/wx/msw/dirdlg.h b/include/wx/msw/dirdlg.h index 5f8f7778ac..71886f18c5 100644 --- a/include/wx/msw/dirdlg.h +++ b/include/wx/msw/dirdlg.h @@ -18,7 +18,7 @@ #include "wx/dialog.h" -WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr; class WXDLLEXPORT wxDirDialog: public wxDialog { diff --git a/include/wx/msw/filedlg.h b/include/wx/msw/filedlg.h index 7a02cfab45..65a4badb0c 100644 --- a/include/wx/msw/filedlg.h +++ b/include/wx/msw/filedlg.h @@ -22,8 +22,8 @@ * File selector */ -WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr; -WXDLLEXPORT_DATA(extern const char*) wxFileSelectorDefaultWildcardStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorDefaultWildcardStr; class WXDLLEXPORT wxFileDialog: public wxDialog { @@ -71,38 +71,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 -- 2.45.2