From 57e6713594b149b521f9f2a85f8345be4f78eb60 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 8 Sep 2002 00:49:48 +0000 Subject: [PATCH] char -> wxChar git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mimetype.h | 8 +++---- src/common/filesys.cpp | 50 +++++++++++++++++++++--------------------- src/common/mimecmn.cpp | 10 ++++----- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h index 87c55befac..241bdb34f9 100644 --- a/include/wx/mimetype.h +++ b/include/wx/mimetype.h @@ -81,10 +81,10 @@ class WXDLLEXPORT wxFileTypeInfo public: // ctors // a normal item - wxFileTypeInfo(const char *mimeType, - const char *openCmd, - const char *printCmd, - const char *desc, + wxFileTypeInfo(const wxChar *mimeType, + const wxChar *openCmd, + const wxChar *printCmd, + const wxChar *desc, // the other parameters form a NULL terminated list of // extensions ...); diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 5586e348dc..93b65254dd 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -434,35 +434,35 @@ class wxFileSystemModule : public wxModule #if wxUSE_MIMETYPE gs_FSMimeFallbacks = new wxFileTypeInfo[6]; gs_FSMimeFallbacks[0] = - wxFileTypeInfo("image/jpeg", - "", - "", - "JPEG image (from fallback)", - "jpg", "jpeg", NULL); + wxFileTypeInfo(_T("image/jpeg"), + _T(""), + _T(""), + _T("JPEG image (from fallback)"), + _T("jpg"), _T("jpeg"), NULL); gs_FSMimeFallbacks[1] = - wxFileTypeInfo("image/gif", - "", - "", - "GIF image (from fallback)", - "gif", NULL); + wxFileTypeInfo(_T("image/gif"), + _T(""), + _T(""), + _T("GIF image (from fallback)"), + _T("gif"), NULL); gs_FSMimeFallbacks[2] = - wxFileTypeInfo("image/png", - "", - "", - "PNG image (from fallback)", - "png", NULL); + wxFileTypeInfo(_T("image/png"), + _T(""), + _T(""), + _T("PNG image (from fallback)"), + _T("png"), NULL); gs_FSMimeFallbacks[3] = - wxFileTypeInfo("image/bmp", - "", - "", - "windows bitmap image (from fallback)", - "bmp", NULL); + wxFileTypeInfo(_T("image/bmp"), + _T(""), + _T(""), + _T("windows bitmap image (from fallback)"), + _T("bmp"), NULL); gs_FSMimeFallbacks[4] = - wxFileTypeInfo("text/html", - "", - "", - "HTML document (from fallback)", - "htm", "html", NULL); + wxFileTypeInfo(_T("text/html"), + _T(""), + _T(""), + _T("HTML document (from fallback)"), + _T("htm"), _T("html"), NULL); gs_FSMimeFallbacks[5] = // must terminate the table with this! wxFileTypeInfo(); diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp index 24265777c8..1335ec68bf 100644 --- a/src/common/mimecmn.cpp +++ b/src/common/mimecmn.cpp @@ -74,10 +74,10 @@ // wxFileTypeInfo // ---------------------------------------------------------------------------- -wxFileTypeInfo::wxFileTypeInfo(const char *mimeType, - const char *openCmd, - const char *printCmd, - const char *desc, +wxFileTypeInfo::wxFileTypeInfo(const wxChar *mimeType, + const wxChar *openCmd, + const wxChar *printCmd, + const wxChar *desc, ...) : m_mimeType(mimeType), m_openCmd(openCmd), @@ -89,7 +89,7 @@ wxFileTypeInfo::wxFileTypeInfo(const char *mimeType, for ( ;; ) { - const char *ext = va_arg(argptr, const char *); + const wxChar *ext = va_arg(argptr, const wxChar *); if ( !ext ) { // NULL terminates the list -- 2.45.2