X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c9a19aabab3a878b565e6c2a5f2a3824277c4dc..d9fc8e993a3de81c03bd1b91c5fca15839c1f7d1:/src/msw/mimetype.cpp

diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp
index bc4e634a05..a067ac7de3 100644
--- a/src/msw/mimetype.cpp
+++ b/src/msw/mimetype.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/mimetype.cpp
+// Name:        src/msw/mimetype.cpp
 // Purpose:     classes and functions to manage MIME types
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -9,34 +9,31 @@
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef    __GNUG__
-#pragma implementation "mimetype.h"
-#endif
-
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_MIMETYPE
 
-// Doesn't compile in WIN16 mode
-#ifndef __WIN16__
+#include "wx/msw/mimetype.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
     #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/crt.h"
     #if wxUSE_GUI
         #include "wx/icon.h"
         #include "wx/msgdlg.h"
     #endif
 #endif //WX_PRECOMP
 
-#include "wx/log.h"
 #include "wx/file.h"
-#include "wx/intl.h"
-#include "wx/dynarray.h"
+#include "wx/iconloc.h"
 #include "wx/confbase.h"
 
 #ifdef __WXMSW__
@@ -44,13 +41,11 @@
     #include "wx/msw/private.h"
 #endif // OS
 
-#include "wx/msw/mimetype.h"
-
 // other standard headers
 #include <ctype.h>
 
 // in case we're compiling in non-GUI mode
-class WXDLLEXPORT wxIcon;
+class WXDLLIMPEXP_FWD_CORE wxIcon;
 
 // These classes use Windows registry to retrieve the required information.
 //
@@ -76,10 +71,46 @@ class WXDLLEXPORT wxIcon;
 // location, uses it, so it isn't likely to change
 static const wxChar *MIME_DATABASE_KEY = wxT("MIME\\Database\\Content Type\\");
 
+// this function replaces Microsoft %1 with Unix-like %s
+static bool CanonicalizeParams(wxString& command)
+{
+    // transform it from '%1' to '%s' style format string (now also test for %L
+    // as apparently MS started using it as well for the same purpose)
+
+    // NB: we don't make any attempt to verify that the string is valid, i.e.
+    //     doesn't contain %2, or second %1 or .... But we do make sure that we
+    //     return a string with _exactly_ one '%s'!
+    bool foundFilename = false;
+    size_t len = command.length();
+    for ( size_t n = 0; (n < len) && !foundFilename; n++ )
+    {
+        if ( command[n] == wxT('%') &&
+                (n + 1 < len) &&
+                (command[n + 1] == wxT('1') || command[n + 1] == wxT('L')) )
+        {
+            // replace it with '%s'
+            command[n + 1] = wxT('s');
+
+            foundFilename = true;
+        }
+    }
+
+    if ( foundFilename )
+    {
+        // Some values also contain an addition %* expansion string which is
+        // presumably supposed to be replaced with the names of the other files
+        // accepted by the command. As we don't support more than one file
+        // anyhow, simply ignore it.
+        command.Replace(" %*", "");
+    }
+
+    return foundFilename;
+}
+
 void wxFileTypeImpl::Init(const wxString& strFileType, const wxString& ext)
 {
     // VZ: does it? (FIXME)
-    wxCHECK_RET( !ext.IsEmpty(), _T("needs an extension") );
+    wxCHECK_RET( !ext.empty(), wxT("needs an extension") );
 
     if ( ext[0u] != wxT('.') ) {
         m_ext = wxT('.');
@@ -88,14 +119,14 @@ void wxFileTypeImpl::Init(const wxString& strFileType, const wxString& ext)
 
     m_strFileType = strFileType;
     if ( !strFileType ) {
-        m_strFileType = m_ext.AfterFirst('.') + _T("_auto_file");
+        m_strFileType = m_ext.AfterFirst('.') + wxT("_auto_file");
     }
 }
 
 wxString wxFileTypeImpl::GetVerbPath(const wxString& verb) const
 {
     wxString path;
-    path << m_strFileType << _T("\\shell\\") << verb << _T("\\command");
+    path << m_strFileType << wxT("\\shell\\") << verb << wxT("\\command");
     return path;
 }
 
@@ -103,16 +134,16 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs,
                                       wxArrayString *commands,
                                       const wxFileType::MessageParameters& params) const
 {
-    wxCHECK_MSG( !m_ext.IsEmpty(), 0, _T("GetAllCommands() needs an extension") );
+    wxCHECK_MSG( !m_ext.empty(), 0, wxT("GetAllCommands() needs an extension") );
 
-    if ( m_strFileType.IsEmpty() )
+    if ( m_strFileType.empty() )
     {
         // get it from the registry
         wxFileTypeImpl *self = wxConstCast(this, wxFileTypeImpl);
         wxRegKey rkey(wxRegKey::HKCR, m_ext);
-        if ( !rkey.Exists() || !rkey.QueryValue(_T(""), self->m_strFileType) )
+        if ( !rkey.Exists() || !rkey.QueryValue(wxEmptyString, self->m_strFileType) )
         {
-            wxLogDebug(_T("Can't get the filetype for extension '%s'."),
+            wxLogDebug(wxT("Can't get the filetype for extension '%s'."),
                        m_ext.c_str());
 
             return 0;
@@ -121,7 +152,7 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs,
 
     // enum all subkeys of HKCR\filetype\shell
     size_t count = 0;
-    wxRegKey rkey(wxRegKey::HKCR, m_strFileType  + _T("\\shell"));
+    wxRegKey rkey(wxRegKey::HKCR, m_strFileType  + wxT("\\shell"));
     long dummy;
     wxString verb;
     bool ok = rkey.GetFirstKey(verb, dummy);
@@ -131,7 +162,7 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs,
 
         // we want the open bverb to eb always the first
 
-        if ( verb.CmpNoCase(_T("open")) == 0 )
+        if ( verb.CmpNoCase(wxT("open")) == 0 )
         {
             if ( verbs )
                 verbs->Insert(verb, 0);
@@ -163,31 +194,62 @@ bool wxFileTypeImpl::EnsureExtKeyExists()
     wxRegKey rkey(wxRegKey::HKCR, m_ext);
     if ( !rkey.Exists() )
     {
-        if ( !rkey.Create() || !rkey.SetValue(_T(""), m_strFileType) )
+        if ( !rkey.Create() || !rkey.SetValue(wxEmptyString, m_strFileType) )
         {
             wxLogError(_("Failed to create registry entry for '%s' files."),
                        m_ext.c_str());
-            return FALSE;
+            return false;
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
 // get the command to use
 // ----------------------------------------------------------------------------
 
-wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const
+static wxString wxFileTypeImplGetCurVer(const wxString& progId)
+{
+    wxRegKey key(wxRegKey::HKCR, progId + wxT("\\CurVer"));
+    if (key.Exists())
+    {
+        wxString value;
+        if (key.QueryValue(wxEmptyString, value))
+            return value;
+    }
+    return progId;
+}
+
+wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
 {
     // suppress possible error messages
     wxLogNull nolog;
     wxString strKey;
 
-    if ( wxRegKey(wxRegKey::HKCR, m_ext + _T("\\shell")).Exists() )
+    {
+        wxRegKey explorerKey(wxRegKey::HKCU, wxT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\") + m_ext);
+        if (explorerKey.Exists())
+        {
+            if (explorerKey.Open(wxRegKey::Read))
+            {
+                if (explorerKey.QueryValue(wxT("Progid"), strKey))
+                {
+                    strKey = wxFileTypeImplGetCurVer(strKey);
+                }
+            }
+        }
+    }
+
+    if (!strKey && wxRegKey(wxRegKey::HKCR, m_ext + wxT("\\shell")).Exists())
         strKey = m_ext;
-    if ( wxRegKey(wxRegKey::HKCR, m_strFileType + _T("\\shell")).Exists() )
-        strKey = m_strFileType;
+
+    if ( !strKey && !m_strFileType.empty())
+    {
+        wxString fileType = wxFileTypeImplGetCurVer(m_strFileType);
+        if (wxRegKey(wxRegKey::HKCR, fileType + wxT("\\shell")).Exists())
+            strKey = fileType;
+    }
 
     if ( !strKey )
     {
@@ -196,61 +258,43 @@ wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const
     }
 
     strKey << wxT("\\shell\\") << verb;
-    wxRegKey key(wxRegKey::HKCR, strKey + _T("\\command"));
+    wxRegKey key(wxRegKey::HKCR, strKey + wxT("\\command"));
     wxString command;
-    if ( key.Open() ) {
+    if ( key.Open(wxRegKey::Read) ) {
         // it's the default value of the key
-        if ( key.QueryValue(wxT(""), command) ) {
-            // transform it from '%1' to '%s' style format string (now also
-            // test for %L - apparently MS started using it as well for the
-            // same purpose)
-
-            // NB: we don't make any attempt to verify that the string is valid,
-            //     i.e. doesn't contain %2, or second %1 or .... But we do make
-            //     sure that we return a string with _exactly_ one '%s'!
-            bool foundFilename = FALSE;
-            size_t len = command.Len();
-            for ( size_t n = 0; (n < len) && !foundFilename; n++ ) {
-                if ( command[n] == wxT('%') &&
-                     (n + 1 < len) &&
-                     (command[n + 1] == wxT('1') ||
-                      command[n + 1] == wxT('L')) ) {
-                    // replace it with '%s'
-                    command[n + 1] = wxT('s');
-
-                    foundFilename = TRUE;
-                }
-            }
+        if ( key.QueryValue(wxEmptyString, command) ) {
+            bool foundFilename = CanonicalizeParams(command);
 
 #if wxUSE_IPC
             // look whether we must issue some DDE requests to the application
             // (and not just launch it)
-            strKey += _T("\\DDEExec");
+            strKey += wxT("\\DDEExec");
             wxRegKey keyDDE(wxRegKey::HKCR, strKey);
-            if ( keyDDE.Open() ) {
+            if ( keyDDE.Open(wxRegKey::Read) ) {
                 wxString ddeCommand, ddeServer, ddeTopic;
-                keyDDE.QueryValue(_T(""), ddeCommand);
-                ddeCommand.Replace(_T("%1"), _T("%s"));
+                keyDDE.QueryValue(wxEmptyString, ddeCommand);
+                ddeCommand.Replace(wxT("%1"), wxT("%s"));
 
-                wxRegKey(wxRegKey::HKCR, strKey + _T("\\Application")).
-                    QueryValue(_T(""), ddeServer);
-                wxRegKey(wxRegKey::HKCR, strKey + _T("\\Topic")).
-                    QueryValue(_T(""), ddeTopic);
+                wxRegKey keyServer(wxRegKey::HKCR, strKey + wxT("\\Application"));
+                keyServer.QueryValue(wxEmptyString, ddeServer);
+                wxRegKey keyTopic(wxRegKey::HKCR, strKey + wxT("\\Topic"));
+                keyTopic.QueryValue(wxEmptyString, ddeTopic);
 
-                if (ddeTopic.IsEmpty())
+                if (ddeTopic.empty())
                     ddeTopic = wxT("System");
 
                 // HACK: we use a special feature of wxExecute which exists
                 //       just because we need it here: it will establish DDE
                 //       conversation with the program it just launched
-                command.Prepend(_T("WX_DDE#"));
-                command << _T('#') << ddeServer
-                        << _T('#') << ddeTopic
-                        << _T('#') << ddeCommand;
+                command.Prepend(wxT("WX_DDE#"));
+                command << wxT('#') << ddeServer
+                        << wxT('#') << ddeTopic
+                        << wxT('#') << ddeCommand;
             }
             else
 #endif // wxUSE_IPC
-                if ( !foundFilename ) {
+            if ( !foundFilename )
+            {
                 // we didn't find any '%1' - the application doesn't know which
                 // file to open (note that we only do it if there is no DDEExec
                 // subkey)
@@ -274,7 +318,7 @@ wxFileTypeImpl::GetOpenCommand(wxString *openCmd,
 
     *openCmd = wxFileType::ExpandCommand(cmd, params);
 
-    return !openCmd->IsEmpty();
+    return !openCmd->empty();
 }
 
 bool
@@ -286,7 +330,7 @@ wxFileTypeImpl::GetPrintCommand(wxString *printCmd,
 
     *printCmd = wxFileType::ExpandCommand(cmd, params);
 
-    return !printCmd->IsEmpty();
+    return !printCmd->empty();
 }
 
 // ----------------------------------------------------------------------------
@@ -296,17 +340,17 @@ wxFileTypeImpl::GetPrintCommand(wxString *printCmd,
 // TODO this function is half implemented
 bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
 {
-    if ( m_ext.IsEmpty() ) {
+    if ( m_ext.empty() ) {
         // the only way to get the list of extensions from the file type is to
         // scan through all extensions in the registry - too slow...
-        return FALSE;
+        return false;
     }
     else {
         extensions.Empty();
         extensions.Add(m_ext);
 
         // it's a lie too, we don't return _all_ extensions...
-        return TRUE;
+        return true;
     }
 }
 
@@ -316,7 +360,8 @@ bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const
     wxLogNull nolog;
     wxRegKey key(wxRegKey::HKCR, m_ext);
 
-    return key.Open() && key.QueryValue(wxT("Content Type"), *mimeType);
+    return key.Open(wxRegKey::Read) &&
+                key.QueryValue(wxT("Content Type"), *mimeType);
 }
 
 bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
@@ -325,20 +370,17 @@ bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
 
     if ( !GetMimeType(&s) )
     {
-        return FALSE;
+        return false;
     }
 
     mimeTypes.Clear();
     mimeTypes.Add(s);
-    return TRUE;
+    return true;
 }
 
 
-bool wxFileTypeImpl::GetIcon(wxIcon *icon,
-                             wxString *iconFile,
-                             int *iconIndex) const
+bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const
 {
-#if wxUSE_GUI
     wxString strIconKey;
     strIconKey << m_strFileType << wxT("\\DefaultIcon");
 
@@ -346,10 +388,10 @@ bool wxFileTypeImpl::GetIcon(wxIcon *icon,
     wxLogNull nolog;
     wxRegKey key(wxRegKey::HKCR, strIconKey);
 
-    if ( key.Open() ) {
+    if ( key.Open(wxRegKey::Read) ) {
         wxString strIcon;
         // it's the default value of the key
-        if ( key.QueryValue(wxT(""), strIcon) ) {
+        if ( key.QueryValue(wxEmptyString, strIcon) ) {
             // the format is the following: <full path to file>, <icon index>
             // NB: icon index may be negative as well as positive and the full
             //     path may contain the environment variables inside '%'
@@ -358,40 +400,24 @@ bool wxFileTypeImpl::GetIcon(wxIcon *icon,
 
             // index may be omitted, in which case BeforeLast(',') is empty and
             // AfterLast(',') is the whole string
-            if ( strFullPath.IsEmpty() ) {
+            if ( strFullPath.empty() ) {
                 strFullPath = strIndex;
                 strIndex = wxT("0");
             }
 
-            wxString strExpPath = wxExpandEnvVars(strFullPath);
-            // here we need C based counting!
-            int nIndex = wxAtoi(strIndex);
-
-            HICON hIcon = ExtractIcon(GetModuleHandle(NULL), strExpPath, nIndex);
-            switch ( (int)hIcon ) {
-                case 0: // means no icons were found
-                case 1: // means no such file or it wasn't a DLL/EXE/OCX/ICO/...
-                    wxLogDebug(wxT("incorrect registry entry '%s': no such icon."),
-                               key.GetName().c_str());
-                    break;
-
-                default:
-                    icon->SetHICON((WXHICON)hIcon);
-                    wxSize size = wxGetHiconSize(hIcon);
-                    icon->SetSize(size);
-                    if ( iconIndex )
-                        *iconIndex = nIndex;
-                    if ( iconFile )
-                        *iconFile = strFullPath;
-                    return TRUE;
+            if ( iconLoc )
+            {
+                iconLoc->SetFileName(wxExpandEnvVars(strFullPath));
+
+                iconLoc->SetIndex(wxAtoi(strIndex));
             }
+
+            return true;
         }
     }
 
     // no such file type or no value or incorrect icon entry
-#endif // wxUSE_GUI
-
-    return FALSE;
+    return false;
 }
 
 bool wxFileTypeImpl::GetDescription(wxString *desc) const
@@ -400,14 +426,14 @@ bool wxFileTypeImpl::GetDescription(wxString *desc) const
     wxLogNull nolog;
     wxRegKey key(wxRegKey::HKCR, m_strFileType);
 
-    if ( key.Open() ) {
+    if ( key.Open(wxRegKey::Read) ) {
         // it's the default value of the key
-        if ( key.QueryValue(wxT(""), *desc) ) {
-            return TRUE;
+        if ( key.QueryValue(wxEmptyString, *desc) ) {
+            return true;
         }
     }
 
-    return FALSE;
+    return false;
 }
 
 // helper function
@@ -433,13 +459,13 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext)
     // suppress possible error messages
     wxLogNull nolog;
 
-    bool knownExtension = FALSE;
+    bool knownExtension = false;
 
     wxString strFileType;
     wxRegKey key(wxRegKey::HKCR, str);
-    if ( key.Open() ) {
+    if ( key.Open(wxRegKey::Read) ) {
         // it's the default value of the key
-        if ( key.QueryValue(wxT(""), strFileType) ) {
+        if ( key.QueryValue(wxEmptyString, strFileType) ) {
             // create the new wxFileType object
             return CreateFileType(strFileType, ext);
         }
@@ -447,7 +473,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext)
             // this extension doesn't have a filetype, but it's known to the
             // system and may be has some other useful keys (open command or
             // content-type), so still return a file type object for it
-            knownExtension = TRUE;
+            knownExtension = true;
         }
     }
 
@@ -486,7 +512,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mimeType)
 
     wxString ext;
     wxRegKey key(wxRegKey::HKCR, strKey);
-    if ( key.Open() ) {
+    if ( key.Open(wxRegKey::Read) ) {
         if ( key.QueryValue(wxT("Extension"), ext) ) {
             return GetFileTypeFromExtension(ext);
         }
@@ -520,21 +546,21 @@ size_t wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString& mimetypes)
 
 wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
 {
-    wxCHECK_MSG( !ftInfo.GetExtensions().IsEmpty(), NULL,
-                 _T("Associate() needs extension") );
+    wxCHECK_MSG( !ftInfo.GetExtensions().empty(), NULL,
+                 wxT("Associate() needs extension") );
 
-    bool ok = FALSE ;
-    int iExtCount = 0 ;
+    bool ok;
+    size_t iExtCount = 0;
     wxString filetype;
     wxString extWithDot;
 
     wxString ext = ftInfo.GetExtensions()[iExtCount];
 
     wxCHECK_MSG( !ext.empty(), NULL,
-                 _T("Associate() needs non empty extension") );
+                 wxT("Associate() needs non empty extension") );
 
-    if ( ext[0u] != _T('.') )
-        extWithDot = _T('.');
+    if ( ext[0u] != wxT('.') )
+        extWithDot = wxT('.');
     extWithDot += ext;
 
     // start by setting the HKCR\\.ext entries
@@ -552,7 +578,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
             if ( filetypeOrig.empty() )
             {
                 // make it up from the extension
-                filetype << extWithDot.c_str() + 1 << _T("_file");
+                filetype << extWithDot.c_str() + 1 << wxT("_file");
             }
             else
             {
@@ -560,102 +586,102 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
                 filetype = filetypeOrig;
             }
 
-            ok = key.SetValue(_T(""), filetype);
+            key.SetValue(wxEmptyString, filetype);
         }
+    }
+    else
+    {
+        // key already exists, maybe we want to change it ??
+        if (!filetypeOrig.empty())
+        {
+            filetype = filetypeOrig;
+            key.SetValue(wxEmptyString, filetype);
         }
         else
         {
-            // key already exists, maybe we want to change it ??
-            if (!filetypeOrig.empty())
-                {
-                    filetype = filetypeOrig;
-                    ok = key.SetValue(_T(""), filetype);
-                }
-            else
-                {
-                    ok = key.QueryValue(_T(""), filetype);
-                }
+            key.QueryValue(wxEmptyString, filetype);
         }
-        // now set a mimetypeif we have it, but ignore it if none
-        const wxString& mimetype = ftInfo.GetMimeType();
-        if ( !mimetype.empty() )
+    }
+
+    // now set a mimetypeif we have it, but ignore it if none
+    const wxString& mimetype = ftInfo.GetMimeType();
+    if ( !mimetype.empty() )
+    {
+        // set the MIME type
+        ok = key.SetValue(wxT("Content Type"), mimetype);
+
+        if ( ok )
         {
-            // set the MIME type
-            ok = key.SetValue(_T("Content Type"), mimetype);
+            // create the MIME key
+            wxString strKey = MIME_DATABASE_KEY;
+            strKey << mimetype;
+            wxRegKey keyMIME(wxRegKey::HKCR, strKey);
+            ok = keyMIME.Create();
 
             if ( ok )
             {
-                // create the MIME key
-                wxString strKey = MIME_DATABASE_KEY;
-                strKey << mimetype;
-                wxRegKey keyMIME(wxRegKey::HKCR, strKey);
-                ok = keyMIME.Create();
-
-                if ( ok )
-                {
-                    // and provide a back link to the extension
-                    ok = keyMIME.SetValue(_T("Extension"), extWithDot);
-                }
+                // and provide a back link to the extension
+                keyMIME.SetValue(wxT("Extension"), extWithDot);
             }
         }
+    }
 
 
     // now make other extensions have the same filetype
 
     for (iExtCount=1; iExtCount < ftInfo.GetExtensionsCount(); iExtCount++ )
-        {
-            ext = ftInfo.GetExtensions()[iExtCount];
-            if ( ext[0u] != _T('.') )
-               extWithDot = _T('.');
-            extWithDot += ext;
+    {
+        ext = ftInfo.GetExtensions()[iExtCount];
+        if ( ext[0u] != wxT('.') )
+           extWithDot = wxT('.');
+        extWithDot += ext;
 
-            wxRegKey key(wxRegKey::HKCR, extWithDot);
-            if ( !key.Exists() ) ok = key.Create();
-            ok = key.SetValue(_T(""), filetype);
+        wxRegKey key(wxRegKey::HKCR, extWithDot);
+        if ( !key.Exists() ) key.Create();
+        key.SetValue(wxEmptyString, filetype);
 
         // now set any mimetypes we may have, but ignore it if none
         const wxString& mimetype = ftInfo.GetMimeType();
         if ( !mimetype.empty() )
         {
             // set the MIME type
-            ok = key.SetValue(_T("Content Type"), mimetype);
+            ok = key.SetValue(wxT("Content Type"), mimetype);
 
-        if ( ok )
-        {
+            if ( ok )
+            {
                 // create the MIME key
                 wxString strKey = MIME_DATABASE_KEY;
                 strKey << mimetype;
                 wxRegKey keyMIME(wxRegKey::HKCR, strKey);
                 ok = keyMIME.Create();
 
-        if ( ok )
-        {
+                if ( ok )
+                {
                     // and provide a back link to the extension
-                    ok = keyMIME.SetValue(_T("Extension"), extWithDot);
-        }
+                    keyMIME.SetValue(wxT("Extension"), extWithDot);
+                }
+            }
         }
-    }
-
 
     } // end of for loop; all extensions now point to HKCR\.ext\Default
 
     // create the filetype key itself (it will be empty for now, but
     // SetCommand(), SetDefaultIcon() &c will use it later)
     wxRegKey keyFT(wxRegKey::HKCR, filetype);
-    ok = keyFT.Create();
+    keyFT.Create();
 
-    wxFileType *ft = NULL;
-    ft = CreateFileType(filetype, extWithDot);
+    wxFileType *ft = CreateFileType(filetype, extWithDot);
 
     if (ft)
     {
-            if (! ftInfo.GetOpenCommand ().IsEmpty() ) ft->SetCommand (ftInfo.GetOpenCommand (), wxT("open"  ) );
-            if (! ftInfo.GetPrintCommand().IsEmpty() ) ft->SetCommand (ftInfo.GetPrintCommand(), wxT("print" ) );
-            // chris: I don't like the ->m_impl-> here FIX this ??
-            if (! ftInfo.GetDescription ().IsEmpty() ) ft->m_impl->SetDescription (ftInfo.GetDescription ()) ;
-            if (! ftInfo.GetIconFile().IsEmpty() ) ft->SetDefaultIcon (ftInfo.GetIconFile(), ftInfo.GetIconIndex() );
+        if (! ftInfo.GetOpenCommand ().empty() ) ft->SetCommand (ftInfo.GetOpenCommand (), wxT("open"  ) );
+        if (! ftInfo.GetPrintCommand().empty() ) ft->SetCommand (ftInfo.GetPrintCommand(), wxT("print" ) );
+        // chris: I don't like the ->m_impl-> here FIX this ??
+        if (! ftInfo.GetDescription ().empty() ) ft->m_impl->SetDescription (ftInfo.GetDescription ()) ;
+        if (! ftInfo.GetIconFile().empty() ) ft->SetDefaultIcon (ftInfo.GetIconFile(), ftInfo.GetIconIndex() );
+
+    }
 
-        }
     return ft;
 }
 
@@ -663,11 +689,11 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd,
                                 const wxString& verb,
                                 bool WXUNUSED(overwriteprompt))
 {
-    wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), FALSE,
-                 _T("SetCommand() needs an extension and a verb") );
+    wxCHECK_MSG( !m_ext.empty() && !verb.empty(), false,
+                 wxT("SetCommand() needs an extension and a verb") );
 
     if ( !EnsureExtKeyExists() )
-        return FALSE;
+        return false;
 
     wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb));
 #if 0
@@ -675,7 +701,7 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd,
     {
 #if wxUSE_GUI
         wxString old;
-        rkey.QueryValue(wxT(""), old);
+        rkey.QueryValue(wxEmptyString, old);
         if ( wxMessageBox
              (
                 wxString::Format(
@@ -692,23 +718,23 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd,
 #endif // wxUSE_GUI
         {
             // cancelled by user
-            return FALSE;
+            return false;
         }
     }
 #endif
     // TODO:
     // 1. translate '%s' to '%1' instead of always adding it
     // 2. create DDEExec value if needed (undo GetCommand)
-    return rkey.Create() && rkey.SetValue(_T(""), cmd + _T(" \"%1\"") );
+    return rkey.Create() && rkey.SetValue(wxEmptyString, cmd + wxT(" \"%1\"") );
 }
 
 /* // no longer used
 bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig)
 {
-    wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("SetMimeType() needs extension") );
+    wxCHECK_MSG( !m_ext.empty(), false, wxT("SetMimeType() needs extension") );
 
     if ( !EnsureExtKeyExists() )
-        return FALSE;
+        return false;
 
     // VZ: is this really useful? (FIXME)
     wxString mimeType;
@@ -716,8 +742,8 @@ bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig)
     {
         // make up a default value for it
         wxString cmd;
-        wxSplitPath(GetCommand(_T("open")), NULL, &cmd, NULL);
-        mimeType << _T("application/x-") << cmd;
+        wxFileName::SplitPath(GetCommand(wxT("open")), NULL, &cmd, NULL);
+        mimeType << wxT("application/x-") << cmd;
     }
     else
     {
@@ -725,39 +751,39 @@ bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig)
     }
 
     wxRegKey rkey(wxRegKey::HKCR, m_ext);
-    return rkey.Create() && rkey.SetValue(_T("Content Type"), mimeType);
+    return rkey.Create() && rkey.SetValue(wxT("Content Type"), mimeType);
 }
 */
 
 bool wxFileTypeImpl::SetDefaultIcon(const wxString& cmd, int index)
 {
-    wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("SetDefaultIcon() needs extension") );
-    wxCHECK_MSG( !m_strFileType.IsEmpty(), FALSE, _T("File key not found") );
+    wxCHECK_MSG( !m_ext.empty(), false, wxT("SetDefaultIcon() needs extension") );
+    wxCHECK_MSG( !m_strFileType.empty(), false, wxT("File key not found") );
 //    the next line fails on a SMBshare, I think because it is case mangled
-//    wxCHECK_MSG( !wxFileExists(cmd), FALSE, _T("Icon file not found.") );
+//    wxCHECK_MSG( !wxFileExists(cmd), false, wxT("Icon file not found.") );
 
     if ( !EnsureExtKeyExists() )
-        return FALSE;
+        return false;
 
-    wxRegKey rkey(wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon"));
+    wxRegKey rkey(wxRegKey::HKCR, m_strFileType + wxT("\\DefaultIcon"));
 
     return rkey.Create() &&
-           rkey.SetValue(_T(""),
-                         wxString::Format(_T("%s,%d"), cmd.c_str(), index));
+           rkey.SetValue(wxEmptyString,
+                         wxString::Format(wxT("%s,%d"), cmd.c_str(), index));
 }
 
 bool wxFileTypeImpl::SetDescription (const wxString& desc)
 {
-    wxCHECK_MSG( !m_strFileType.IsEmpty(), FALSE, _T("File key not found") );
-    wxCHECK_MSG( !desc.IsEmpty(), FALSE, _T("No file description supplied") );
+    wxCHECK_MSG( !m_strFileType.empty(), false, wxT("File key not found") );
+    wxCHECK_MSG( !desc.empty(), false, wxT("No file description supplied") );
 
     if ( !EnsureExtKeyExists() )
-        return FALSE;
+        return false;
 
     wxRegKey rkey(wxRegKey::HKCR, m_strFileType );
 
     return rkey.Create() &&
-           rkey.SetValue(_T(""), desc);
+           rkey.SetValue(wxEmptyString, desc);
 }
 
 // ----------------------------------------------------------------------------
@@ -766,15 +792,15 @@ bool wxFileTypeImpl::SetDescription (const wxString& desc)
 
 bool wxFileTypeImpl::Unassociate()
 {
-    bool result = TRUE;
+    bool result = true;
     if ( !RemoveOpenCommand() )
-        result = FALSE;
+        result = false;
     if ( !RemoveDefaultIcon() )
-        result = FALSE;
+        result = false;
     if ( !RemoveMimeType() )
-        result = FALSE;
-   if ( !RemoveDescription() )
-        result = FALSE;
+        result = false;
+    if ( !RemoveDescription() )
+        result = false;
 
 /*
     //this might hold other keys, eg some have CSLID keys
@@ -791,15 +817,14 @@ bool wxFileTypeImpl::Unassociate()
 
 bool wxFileTypeImpl::RemoveOpenCommand()
 {
-   return RemoveCommand(_T("open"));
+   return RemoveCommand(wxT("open"));
 }
 
 bool wxFileTypeImpl::RemoveCommand(const wxString& verb)
 {
-    wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), FALSE,
-                 _T("RemoveCommand() needs an extension and a verb") );
+    wxCHECK_MSG( !m_ext.empty() && !verb.empty(), false,
+                 wxT("RemoveCommand() needs an extension and a verb") );
 
-    wxString  sKey = m_strFileType;
     wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb));
 
     // if the key already doesn't exist, it's a success
@@ -808,7 +833,7 @@ bool wxFileTypeImpl::RemoveCommand(const wxString& verb)
 
 bool wxFileTypeImpl::RemoveMimeType()
 {
-    wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("RemoveMimeType() needs extension") );
+    wxCHECK_MSG( !m_ext.empty(), false, wxT("RemoveMimeType() needs extension") );
 
     wxRegKey rkey(wxRegKey::HKCR, m_ext);
     return !rkey.Exists() || rkey.DeleteSelf();
@@ -816,23 +841,20 @@ bool wxFileTypeImpl::RemoveMimeType()
 
 bool wxFileTypeImpl::RemoveDefaultIcon()
 {
-    wxCHECK_MSG( !m_ext.IsEmpty(), FALSE,
-                 _T("RemoveDefaultIcon() needs extension") );
+    wxCHECK_MSG( !m_ext.empty(), false,
+                 wxT("RemoveDefaultIcon() needs extension") );
 
-    wxRegKey rkey (wxRegKey::HKCR, m_strFileType  + _T("\\DefaultIcon"));
+    wxRegKey rkey (wxRegKey::HKCR, m_strFileType  + wxT("\\DefaultIcon"));
     return !rkey.Exists() || rkey.DeleteSelf();
 }
 
 bool wxFileTypeImpl::RemoveDescription()
 {
-    wxCHECK_MSG( !m_ext.IsEmpty(), FALSE,
-                 _T("RemoveDescription() needs extension") );
+    wxCHECK_MSG( !m_ext.empty(), false,
+                 wxT("RemoveDescription() needs extension") );
 
     wxRegKey rkey (wxRegKey::HKCR, m_strFileType );
     return !rkey.Exists() || rkey.DeleteSelf();
 }
 
-#endif
-  // __WIN16__
-
 #endif // wxUSE_MIMETYPE