char -> wxChar

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index 87c55befac2142e4daaca6fdc51480d4b07bbd6d..241bdb34f9bc289b26caf123ed1fa41779c82fd8 100644 (file)
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -81,10 +81,10 @@ class WXDLLEXPORT wxFileTypeInfo
 public:
     // ctors
         // a normal item
 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
                    ...);
                    // the other parameters form a NULL terminated list of
                    // extensions
                    ...);

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 5586e348dccdaf35db4e095dc1e67dd9b9fafae0..93b65254dd35fd1dbf554a75c00eb68c0d35b85b 100644 (file)
--- 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] =
         #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] =
             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] =
             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] =
             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] =
             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();
             gs_FSMimeFallbacks[5] =
             // must terminate the table with this!
             wxFileTypeInfo();

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index 24265777c8adc8de02b1060bc62399dc77bd07d7..1335ec68bfa646b3aa5b35810c1d64b18e77c671 100644 (file)
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -74,10 +74,10 @@
 // wxFileTypeInfo
 // ----------------------------------------------------------------------------
 
 // 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),
                                ...)
               : m_mimeType(mimeType),
                 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 )
         {
             // NULL terminates the list
         if ( !ext )
         {
             // NULL terminates the list