Try to find comctl32.dll version even if we don't have shlwapi.h available,

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

diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp
index a73c5150e013342f59d96fe8fdbfb5d0608eab92..71334a8134b29228236eab497ecc4ac06244cb3b 100644 (file)
--- a/src/msw/mimetype.cpp
+++ b/src/msw/mimetype.cpp
@@ -6,10 +6,10 @@
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license (part of wxExtra library)
+// Licence:     wxWindows licence (part of wxExtra library)

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef    __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "mimetype.h"
 #endif
 
 #pragma implementation "mimetype.h"
 #endif
 


@@ -20,8 +20,7 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-// this is Win32 only code
-#ifndef __WIN16__
+#if wxUSE_MIMETYPE

 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"


@@ -33,13 +32,14 @@
 
 #include "wx/log.h"
 #include "wx/file.h"
 
 #include "wx/log.h"
 #include "wx/file.h"

+#include "wx/iconloc.h"

 #include "wx/intl.h"
 #include "wx/dynarray.h"
 #include "wx/confbase.h"
 
 #ifdef __WXMSW__
     #include "wx/msw/registry.h"
 #include "wx/intl.h"
 #include "wx/dynarray.h"
 #include "wx/confbase.h"
 
 #ifdef __WXMSW__
     #include "wx/msw/registry.h"

-    #include "windows.h"
+    #include "wx/msw/private.h"

 #endif // OS
 
 #include "wx/msw/mimetype.h"
 #endif // OS
 
 #include "wx/msw/mimetype.h"


@@ -74,10 +74,37 @@ class WXDLLEXPORT wxIcon;
 // location, uses it, so it isn't likely to change
 static const wxChar *MIME_DATABASE_KEY = wxT("MIME\\Database\\Content Type\\");
 
 // 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;
+        }
+    }
+
+    return foundFilename;
+}
+

 void wxFileTypeImpl::Init(const wxString& strFileType, const wxString& ext)
 {
     // VZ: does it? (FIXME)
 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(), _T("needs an extension") );

 
     if ( ext[0u] != wxT('.') ) {
         m_ext = wxT('.');
 
     if ( ext[0u] != wxT('.') ) {
         m_ext = wxT('.');


@@ -86,7 +113,7 @@ void wxFileTypeImpl::Init(const wxString& strFileType, const wxString& ext)
 
     m_strFileType = strFileType;
     if ( !strFileType ) {
 
     m_strFileType = strFileType;
     if ( !strFileType ) {

-        m_strFileType = m_ext.AfterFirst('.') + "_auto_file";
+        m_strFileType = m_ext.AfterFirst('.') + _T("_auto_file");

     }
 }
 
     }
 }
 


@@ -101,14 +128,14 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs,
                                       wxArrayString *commands,
                                       const wxFileType::MessageParameters& params) const
 {
                                       wxArrayString *commands,
                                       const wxFileType::MessageParameters& params) const
 {

-    wxCHECK_MSG( !m_ext.IsEmpty(), 0, _T("GetAllCommands() needs an extension") );
+    wxCHECK_MSG( !m_ext.empty(), 0, _T("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);
     {
         // 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'."),
                        m_ext.c_str());
         {
             wxLogDebug(_T("Can't get the filetype for extension '%s'."),
                        m_ext.c_str());


@@ -161,15 +188,15 @@ bool wxFileTypeImpl::EnsureExtKeyExists()
     wxRegKey rkey(wxRegKey::HKCR, m_ext);
     if ( !rkey.Exists() )
     {
     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());
         {
             wxLogError(_("Failed to create registry entry for '%s' files."),
                        m_ext.c_str());

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -196,44 +223,28 @@ wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const
     strKey << wxT("\\shell\\") << verb;
     wxRegKey key(wxRegKey::HKCR, strKey + _T("\\command"));
     wxString command;
     strKey << wxT("\\shell\\") << verb;
     wxRegKey key(wxRegKey::HKCR, strKey + _T("\\command"));
     wxString command;

-    if ( key.Open() ) {
+    if ( key.Open(wxRegKey::Read) ) {

         // it's the default value of the key
         // 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");
             wxRegKey keyDDE(wxRegKey::HKCR, strKey);
 
 #if wxUSE_IPC
             // look whether we must issue some DDE requests to the application
             // (and not just launch it)
             strKey += _T("\\DDEExec");
             wxRegKey keyDDE(wxRegKey::HKCR, strKey);

-            if ( keyDDE.Open() ) {
+            if ( keyDDE.Open(wxRegKey::Read) ) {

                 wxString ddeCommand, ddeServer, ddeTopic;
                 wxString ddeCommand, ddeServer, ddeTopic;

-                keyDDE.QueryValue(_T(""), ddeCommand);
+                keyDDE.QueryValue(wxEmptyString, ddeCommand);

                 ddeCommand.Replace(_T("%1"), _T("%s"));
 
                 ddeCommand.Replace(_T("%1"), _T("%s"));
 

-                wxRegKey(wxRegKey::HKCR, strKey + _T("\\Application")).
-                    QueryValue(_T(""), ddeServer);
-                wxRegKey(wxRegKey::HKCR, strKey + _T("\\Topic")).
-                    QueryValue(_T(""), ddeTopic);
+                wxRegKey keyServer(wxRegKey::HKCR, strKey + _T("\\Application"));
+                keyServer.QueryValue(wxEmptyString, ddeServer);
+                wxRegKey keyTopic(wxRegKey::HKCR, strKey + _T("\\Topic"));
+                keyTopic.QueryValue(wxEmptyString, ddeTopic);
+
+                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
 
                 // HACK: we use a special feature of wxExecute which exists
                 //       just because we need it here: it will establish DDE


@@ -245,7 +256,8 @@ wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const
             }
             else
 #endif // wxUSE_IPC
             }
             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)
                 // 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)


@@ -269,7 +281,7 @@ wxFileTypeImpl::GetOpenCommand(wxString *openCmd,
 
     *openCmd = wxFileType::ExpandCommand(cmd, params);
 
 
     *openCmd = wxFileType::ExpandCommand(cmd, params);
 

-    return !openCmd->IsEmpty();
+    return !openCmd->empty();

 }
 
 bool
 }
 
 bool


@@ -281,7 +293,7 @@ wxFileTypeImpl::GetPrintCommand(wxString *printCmd,
 
     *printCmd = wxFileType::ExpandCommand(cmd, params);
 
 
     *printCmd = wxFileType::ExpandCommand(cmd, params);
 

-    return !printCmd->IsEmpty();
+    return !printCmd->empty();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -291,17 +303,17 @@ wxFileTypeImpl::GetPrintCommand(wxString *printCmd,
 // TODO this function is half implemented
 bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
 {
 // 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...
         // 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...
     }
     else {
         extensions.Empty();
         extensions.Add(m_ext);
 
         // it's a lie too, we don't return _all_ extensions...

-        return TRUE;
+        return true;

     }
 }
 
     }
 }
 


@@ -311,7 +323,8 @@ bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const
     wxLogNull nolog;
     wxRegKey key(wxRegKey::HKCR, m_ext);
 
     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
 }
 
 bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const


@@ -320,20 +333,17 @@ bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
 
     if ( !GetMimeType(&s) )
     {
 
     if ( !GetMimeType(&s) )
     {

-        return FALSE;
+        return false;

     }
 
     mimeTypes.Clear();
     mimeTypes.Add(s);
     }
 
     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");
 
     wxString strIconKey;
     strIconKey << m_strFileType << wxT("\\DefaultIcon");
 


@@ -341,10 +351,10 @@ bool wxFileTypeImpl::GetIcon(wxIcon *icon,
     wxLogNull nolog;
     wxRegKey key(wxRegKey::HKCR, strIconKey);
 
     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
         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 '%'
             // 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 '%'


@@ -353,38 +363,24 @@ bool wxFileTypeImpl::GetIcon(wxIcon *icon,
 
             // index may be omitted, in which case BeforeLast(',') is empty and
             // AfterLast(',') is the whole string
 
             // 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");
             }
 
                 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);
-                    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
         }
     }
 
     // no such file type or no value or incorrect icon entry

-#endif // wxUSE_GUI
-
-    return FALSE;
+    return false;

 }
 
 bool wxFileTypeImpl::GetDescription(wxString *desc) const
 }
 
 bool wxFileTypeImpl::GetDescription(wxString *desc) const


@@ -393,14 +389,14 @@ bool wxFileTypeImpl::GetDescription(wxString *desc) const
     wxLogNull nolog;
     wxRegKey key(wxRegKey::HKCR, m_strFileType);
 
     wxLogNull nolog;
     wxRegKey key(wxRegKey::HKCR, m_strFileType);
 

-    if ( key.Open() ) {
+    if ( key.Open(wxRegKey::Read) ) {

         // it's the default value of the key
         // 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
 }
 
 // helper function


@@ -426,13 +422,13 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext)
     // suppress possible error messages
     wxLogNull nolog;
 
     // suppress possible error messages
     wxLogNull nolog;
 

-    bool knownExtension = FALSE;
+    bool knownExtension = false;

 
     wxString strFileType;
     wxRegKey key(wxRegKey::HKCR, str);
 
     wxString strFileType;
     wxRegKey key(wxRegKey::HKCR, str);

-    if ( key.Open() ) {
+    if ( key.Open(wxRegKey::Read) ) {

         // it's the default value of the key
         // 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);
         }
             // create the new wxFileType object
             return CreateFileType(strFileType, ext);
         }


@@ -440,7 +436,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
             // 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;

         }
     }
 
         }
     }
 


@@ -479,7 +475,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mimeType)
 
     wxString ext;
     wxRegKey key(wxRegKey::HKCR, strKey);
 
     wxString ext;
     wxRegKey key(wxRegKey::HKCR, strKey);

-    if ( key.Open() ) {
+    if ( key.Open(wxRegKey::Read) ) {

         if ( key.QueryValue(wxT("Extension"), ext) ) {
             return GetFileTypeFromExtension(ext);
         }
         if ( key.QueryValue(wxT("Extension"), ext) ) {
             return GetFileTypeFromExtension(ext);
         }


@@ -513,10 +509,10 @@ size_t wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString& mimetypes)
 
 wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
 {
 
 wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
 {

-    wxCHECK_MSG( !ftInfo.GetExtensions().IsEmpty(), NULL,
+    wxCHECK_MSG( !ftInfo.GetExtensions().empty(), NULL,

                  _T("Associate() needs extension") );
 
                  _T("Associate() needs extension") );
 

-    bool ok = FALSE ;
+    bool ok;

     int iExtCount = 0 ;
     wxString filetype;
     wxString extWithDot;
     int iExtCount = 0 ;
     wxString filetype;
     wxString extWithDot;


@@ -553,7 +549,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
                 filetype = filetypeOrig;
             }
 
                 filetype = filetypeOrig;
             }
 

-            ok = key.SetValue(_T(""), filetype);
+            key.SetValue(wxEmptyString, filetype);

         }
         }
         else
         }
         }
         else


@@ -562,11 +558,11 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
             if (!filetypeOrig.empty())
                 {
                     filetype = filetypeOrig;
             if (!filetypeOrig.empty())
                 {
                     filetype = filetypeOrig;

-                    ok = key.SetValue(_T(""), filetype);
+                    key.SetValue(wxEmptyString, filetype);

                 }
             else
                 {
                 }
             else
                 {

-                    ok = key.QueryValue(_T(""), filetype);
+                    key.QueryValue(wxEmptyString, filetype);

                 }
         }
         // now set a mimetypeif we have it, but ignore it if none
                 }
         }
         // now set a mimetypeif we have it, but ignore it if none


@@ -587,14 +583,14 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
                 if ( ok )
                 {
                     // and provide a back link to the extension
                 if ( ok )
                 {
                     // and provide a back link to the extension

-                    ok = keyMIME.SetValue(_T("Extension"), extWithDot);
+                    keyMIME.SetValue(_T("Extension"), extWithDot);

                 }
             }
         }
 
 
     // now make other extensions have the same filetype
                 }
             }
         }
 
 
     // now make other extensions have the same filetype

-    
+

     for (iExtCount=1; iExtCount < ftInfo.GetExtensionsCount(); iExtCount++ )
         {
             ext = ftInfo.GetExtensions()[iExtCount];
     for (iExtCount=1; iExtCount < ftInfo.GetExtensionsCount(); iExtCount++ )
         {
             ext = ftInfo.GetExtensions()[iExtCount];


@@ -603,8 +599,8 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
             extWithDot += ext;
 
             wxRegKey key(wxRegKey::HKCR, extWithDot);
             extWithDot += ext;
 
             wxRegKey key(wxRegKey::HKCR, extWithDot);

-            if ( !key.Exists() ) ok = key.Create();
-            ok = key.SetValue(_T(""), filetype);
+            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();
 
         // now set any mimetypes we may have, but ignore it if none
         const wxString& mimetype = ftInfo.GetMimeType();


@@ -624,7 +620,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
         if ( ok )
         {
                     // and provide a back link to the extension
         if ( ok )
         {
                     // and provide a back link to the extension

-                    ok = keyMIME.SetValue(_T("Extension"), extWithDot);
+                    keyMIME.SetValue(_T("Extension"), extWithDot);

         }
         }
     }
         }
         }
     }


@@ -635,18 +631,17 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
     // create the filetype key itself (it will be empty for now, but
     // SetCommand(), SetDefaultIcon() &c will use it later)
     wxRegKey keyFT(wxRegKey::HKCR, filetype);
     // 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();
-    
-    wxFileType *ft = NULL; 
-    ft = CreateFileType(filetype, extWithDot);
+    keyFT.Create();
+
+    wxFileType *ft = CreateFileType(filetype, extWithDot);

 
     if (ft)
     {
 
     if (ft)
     {

-            if (! ftInfo.GetOpenCommand ().IsEmpty() ) ft->SetCommand (ftInfo.GetOpenCommand (), wxT("open"  ) );
-            if (! ftInfo.GetPrintCommand().IsEmpty() ) ft->SetCommand (ftInfo.GetPrintCommand(), wxT("print" ) );
+            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 ??
             // 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.GetDescription ().empty() ) ft->m_impl->SetDescription (ftInfo.GetDescription ()) ;
+            if (! ftInfo.GetIconFile().empty() ) ft->SetDefaultIcon (ftInfo.GetIconFile(), ftInfo.GetIconIndex() );

 
         }
     return ft;
 
         }
     return ft;


@@ -654,13 +649,13 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
 
 bool wxFileTypeImpl::SetCommand(const wxString& cmd,
                                 const wxString& verb,
 
 bool wxFileTypeImpl::SetCommand(const wxString& cmd,
                                 const wxString& verb,

-                                bool overwriteprompt)
+                                bool WXUNUSED(overwriteprompt))

 {
 {

-    wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), FALSE,
+    wxCHECK_MSG( !m_ext.empty() && !verb.empty(), false,

                  _T("SetCommand() needs an extension and a verb") );
 
     if ( !EnsureExtKeyExists() )
                  _T("SetCommand() needs an extension and a verb") );
 
     if ( !EnsureExtKeyExists() )

-        return FALSE;
+        return false;

 
     wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb));
 #if 0
 
     wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb));
 #if 0


@@ -668,7 +663,7 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd,
     {
 #if wxUSE_GUI
         wxString old;
     {
 #if wxUSE_GUI
         wxString old;

-        rkey.QueryValue(wxT(""), old);
+        rkey.QueryValue(wxEmptyString, old);

         if ( wxMessageBox
              (
                 wxString::Format(
         if ( wxMessageBox
              (
                 wxString::Format(


@@ -685,23 +680,23 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd,
 #endif // wxUSE_GUI
         {
             // cancelled by user
 #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)
         }
     }
 #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 + _T(" \"%1\"") );

 }
 
 /* // no longer used
 bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig)
 {
 }
 
 /* // 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, _T("SetMimeType() needs extension") );

 
     if ( !EnsureExtKeyExists() )
 
     if ( !EnsureExtKeyExists() )

-        return FALSE;
+        return false;

 
     // VZ: is this really useful? (FIXME)
     wxString mimeType;
 
     // VZ: is this really useful? (FIXME)
     wxString mimeType;


@@ -724,33 +719,33 @@ bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig)
 
 bool wxFileTypeImpl::SetDefaultIcon(const wxString& cmd, int index)
 {
 
 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, _T("SetDefaultIcon() needs extension") );
+    wxCHECK_MSG( !m_strFileType.empty(), false, _T("File key not found") );

 //    the next line fails on a SMBshare, I think because it is case mangled
 //    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, _T("Icon file not found.") );

 
     if ( !EnsureExtKeyExists() )
 
     if ( !EnsureExtKeyExists() )

-        return FALSE;
+        return false;

 
     wxRegKey rkey(wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon"));
 
     return rkey.Create() &&
 
     wxRegKey rkey(wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon"));
 
     return rkey.Create() &&

-           rkey.SetValue(_T(""),
+           rkey.SetValue(wxEmptyString,

                          wxString::Format(_T("%s,%d"), cmd.c_str(), index));
 }
 
 bool wxFileTypeImpl::SetDescription (const wxString& desc)
 {
                          wxString::Format(_T("%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, _T("File key not found") );
+    wxCHECK_MSG( !desc.empty(), false, _T("No file description supplied") );

 
     if ( !EnsureExtKeyExists() )
 
     if ( !EnsureExtKeyExists() )

-        return FALSE;
+        return false;

 
     wxRegKey rkey(wxRegKey::HKCR, m_strFileType );
 
     return rkey.Create() &&
 
     wxRegKey rkey(wxRegKey::HKCR, m_strFileType );
 
     return rkey.Create() &&

-           rkey.SetValue(_T(""), desc);
+           rkey.SetValue(wxEmptyString, desc);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -759,15 +754,15 @@ bool wxFileTypeImpl::SetDescription (const wxString& desc)
 
 bool wxFileTypeImpl::Unassociate()
 {
 
 bool wxFileTypeImpl::Unassociate()
 {

-    bool result = TRUE;
+    bool result = true;

     if ( !RemoveOpenCommand() )
     if ( !RemoveOpenCommand() )

-        result = FALSE;
+        result = false;

     if ( !RemoveDefaultIcon() )
     if ( !RemoveDefaultIcon() )

-        result = FALSE;
+        result = false;

     if ( !RemoveMimeType() )
     if ( !RemoveMimeType() )

-        result = FALSE;
+        result = false;

    if ( !RemoveDescription() )
    if ( !RemoveDescription() )

-        result = FALSE;
+        result = false;

 
 /*
     //this might hold other keys, eg some have CSLID keys
 
 /*
     //this might hold other keys, eg some have CSLID keys


@@ -789,7 +784,7 @@ bool wxFileTypeImpl::RemoveOpenCommand()
 
 bool wxFileTypeImpl::RemoveCommand(const wxString& verb)
 {
 
 bool wxFileTypeImpl::RemoveCommand(const wxString& verb)
 {

-    wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), FALSE,
+    wxCHECK_MSG( !m_ext.empty() && !verb.empty(), false,

                  _T("RemoveCommand() needs an extension and a verb") );
 
     wxString  sKey = m_strFileType;
                  _T("RemoveCommand() needs an extension and a verb") );
 
     wxString  sKey = m_strFileType;


@@ -801,7 +796,7 @@ bool wxFileTypeImpl::RemoveCommand(const wxString& verb)
 
 bool wxFileTypeImpl::RemoveMimeType()
 {
 
 bool wxFileTypeImpl::RemoveMimeType()
 {

-    wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("RemoveMimeType() needs extension") );
+    wxCHECK_MSG( !m_ext.empty(), false, _T("RemoveMimeType() needs extension") );

 
     wxRegKey rkey(wxRegKey::HKCR, m_ext);
     return !rkey.Exists() || rkey.DeleteSelf();
 
     wxRegKey rkey(wxRegKey::HKCR, m_ext);
     return !rkey.Exists() || rkey.DeleteSelf();


@@ -809,7 +804,7 @@ bool wxFileTypeImpl::RemoveMimeType()
 
 bool wxFileTypeImpl::RemoveDefaultIcon()
 {
 
 bool wxFileTypeImpl::RemoveDefaultIcon()
 {

-    wxCHECK_MSG( !m_ext.IsEmpty(), FALSE,
+    wxCHECK_MSG( !m_ext.empty(), false,

                  _T("RemoveDefaultIcon() needs extension") );
 
     wxRegKey rkey (wxRegKey::HKCR, m_strFileType  + _T("\\DefaultIcon"));
                  _T("RemoveDefaultIcon() needs extension") );
 
     wxRegKey rkey (wxRegKey::HKCR, m_strFileType  + _T("\\DefaultIcon"));


@@ -818,12 +813,11 @@ bool wxFileTypeImpl::RemoveDefaultIcon()
 
 bool wxFileTypeImpl::RemoveDescription()
 {
 
 bool wxFileTypeImpl::RemoveDescription()
 {

-    wxCHECK_MSG( !m_ext.IsEmpty(), FALSE,
+    wxCHECK_MSG( !m_ext.empty(), false,

                  _T("RemoveDescription() needs extension") );
 
     wxRegKey rkey (wxRegKey::HKCR, m_strFileType );
     return !rkey.Exists() || rkey.DeleteSelf();
 }
 
                  _T("RemoveDescription() needs extension") );
 
     wxRegKey rkey (wxRegKey::HKCR, m_strFileType );
     return !rkey.Exists() || rkey.DeleteSelf();
 }
 

-#endif
-  // __WIN16__
+#endif // wxUSE_MIMETYPE