AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

char -> wxChar

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-09-08 00:49:48 +00:00
parent 72d35070d8
commit 57e6713594
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/mimetype.h
View File

@ -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
...);

50
src/common/filesys.cpp
View File

@ -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();

10
src/common/mimecmn.cpp
View File

@ -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