Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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
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: public:
// ctors // ctors
// a normal item // a normal item
wxFileTypeInfo(const char *mimeType, wxFileTypeInfo(const wxChar *mimeType,
const char *openCmd, const wxChar *openCmd,
const char *printCmd, const wxChar *printCmd,
const char *desc, const wxChar *desc,
// the other parameters form a NULL terminated list of // the other parameters form a NULL terminated list of
// extensions // extensions
...); ...);

50
src/common/filesys.cpp
View File

@@ -434,35 +434,35 @@ class wxFileSystemModule : public wxModule
#if wxUSE_MIMETYPE #if wxUSE_MIMETYPE
gs_FSMimeFallbacks = new wxFileTypeInfo[6]; gs_FSMimeFallbacks = new wxFileTypeInfo[6];
gs_FSMimeFallbacks[0] = gs_FSMimeFallbacks[0] =
wxFileTypeInfo("image/jpeg", wxFileTypeInfo(_T("image/jpeg"),
"", _T(""),
"", _T(""),
"JPEG image (from fallback)", _T("JPEG image (from fallback)"),
"jpg", "jpeg", NULL); _T("jpg"), _T("jpeg"), NULL);
gs_FSMimeFallbacks[1] = gs_FSMimeFallbacks[1] =
wxFileTypeInfo("image/gif", wxFileTypeInfo(_T("image/gif"),
"", _T(""),
"", _T(""),
"GIF image (from fallback)", _T("GIF image (from fallback)"),
"gif", NULL); _T("gif"), NULL);
gs_FSMimeFallbacks[2] = gs_FSMimeFallbacks[2] =
wxFileTypeInfo("image/png", wxFileTypeInfo(_T("image/png"),
"", _T(""),
"", _T(""),
"PNG image (from fallback)", _T("PNG image (from fallback)"),
"png", NULL); _T("png"), NULL);
gs_FSMimeFallbacks[3] = gs_FSMimeFallbacks[3] =
wxFileTypeInfo("image/bmp", wxFileTypeInfo(_T("image/bmp"),
"", _T(""),
"", _T(""),
"windows bitmap image (from fallback)", _T("windows bitmap image (from fallback)"),
"bmp", NULL); _T("bmp"), NULL);
gs_FSMimeFallbacks[4] = gs_FSMimeFallbacks[4] =
wxFileTypeInfo("text/html", wxFileTypeInfo(_T("text/html"),
"", _T(""),
"", _T(""),
"HTML document (from fallback)", _T("HTML document (from fallback)"),
"htm", "html", NULL); _T("htm"), _T("html"), NULL);
gs_FSMimeFallbacks[5] = gs_FSMimeFallbacks[5] =
// must terminate the table with this! // must terminate the table with this!
wxFileTypeInfo(); wxFileTypeInfo();

10
src/common/mimecmn.cpp
View File

@@ -74,10 +74,10 @@
// wxFileTypeInfo // wxFileTypeInfo
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxFileTypeInfo::wxFileTypeInfo(const char *mimeType, wxFileTypeInfo::wxFileTypeInfo(const wxChar *mimeType,
const char *openCmd, const wxChar *openCmd,
const char *printCmd, const wxChar *printCmd,
const char *desc, const wxChar *desc,
...) ...)
: m_mimeType(mimeType), : m_mimeType(mimeType),
m_openCmd(openCmd), m_openCmd(openCmd),
@@ -89,7 +89,7 @@ wxFileTypeInfo::wxFileTypeInfo(const char *mimeType,
for ( ;; ) for ( ;; )
{ {
const char *ext = va_arg(argptr, const char *); const wxChar *ext = va_arg(argptr, const wxChar *);
if ( !ext ) if ( !ext )
{ {
// NULL terminates the list // NULL terminates the list