Maybe negative wxWindowId are better than just -1.

[wxWidgets.git] / src / common / mimetype.cpp

diff --git a/src/common/mimetype.cpp b/src/common/mimetype.cpp
index 901d85ffb1f4021004df8eab718adda15d468a95..99e0a628b17f67549a5fbe88d4ce626e0db7506f 100644 (file)
--- a/src/common/mimetype.cpp
+++ b/src/common/mimetype.cpp
@@ -100,14 +100,14 @@ public:
     bool GetDescription(wxString *desc) const;
     bool GetOpenCommand(wxString *openCmd,
                         const wxFileType::MessageParameters&) const
     bool GetDescription(wxString *desc) const;
     bool GetOpenCommand(wxString *openCmd,
                         const wxFileType::MessageParameters&) const

-        { return GetCommand(openCmd, "open"); }
+        { return GetCommand(openCmd, _T("open")); }

     bool GetPrintCommand(wxString *printCmd,
                          const wxFileType::MessageParameters&) const
     bool GetPrintCommand(wxString *printCmd,
                          const wxFileType::MessageParameters&) const

-        { return GetCommand(printCmd, "print"); }
+        { return GetCommand(printCmd, _T("print")); }

 
 private:
     // helper function
 
 private:
     // helper function

-    bool GetCommand(wxString *command, const char *verb) const;
+    bool GetCommand(wxString *command, const wxChar *verb) const;

 
     wxString m_strFileType, m_ext;
 };
 
     wxString m_strFileType, m_ext;
 };


@@ -477,7 +477,7 @@ bool wxMimeTypesManager::IsOfType(const wxString& mimeType,
     {
         wxString strSubtype = wildcard.AfterFirst(_T('/'));
 
     {
         wxString strSubtype = wildcard.AfterFirst(_T('/'));
 

-        if ( strSubtype == _T('*') ||
+        if ( strSubtype == _T("*") ||

              strSubtype.IsSameAs(mimeType.AfterFirst(_T('/')), FALSE) )
         {
             // matches (either exactly or it's a wildcard)
              strSubtype.IsSameAs(mimeType.AfterFirst(_T('/')), FALSE) )
         {
             // matches (either exactly or it's a wildcard)


@@ -621,7 +621,7 @@ bool wxFileTypeImpl::GetIcon(wxIcon *icon) const
             }
 
             wxString strExpPath = wxExpandEnvVars(strFullPath);
             }
 
             wxString strExpPath = wxExpandEnvVars(strFullPath);

-            int nIndex = atoi(strIndex);
+            int nIndex = wxAtoi(strIndex);

 
             HICON hIcon = ExtractIcon(GetModuleHandle(NULL), strExpPath, nIndex);
             switch ( (int)hIcon ) {
 
             HICON hIcon = ExtractIcon(GetModuleHandle(NULL), strExpPath, nIndex);
             switch ( (int)hIcon ) {