removed mpthread and added thread.cpp and tglbutton.cpp

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

diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp
index 2588e57b827e2a9c44689f033acd944e8482950c..c4e8974a98f5f1f1145f5b0172167b32d8b026eb 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,6 +74,33 @@ 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)


@@ -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");

     }
 }
 
     }
 }
 


@@ -108,7 +135,7 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs,
         // 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,7 +188,7 @@ 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());


@@ -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"));
 
                 wxRegKey(wxRegKey::HKCR, strKey + _T("\\Application")).
                 ddeCommand.Replace(_T("%1"), _T("%s"));
 
                 wxRegKey(wxRegKey::HKCR, strKey + _T("\\Application")).

-                    QueryValue(_T(""), ddeServer);
+                    QueryValue(wxEmptyString, ddeServer);

                 wxRegKey(wxRegKey::HKCR, strKey + _T("\\Topic")).
                 wxRegKey(wxRegKey::HKCR, strKey + _T("\\Topic")).

-                    QueryValue(_T(""), ddeTopic);
+                    QueryValue(wxEmptyString, ddeTopic);
+
+                if (ddeTopic.IsEmpty())
+                    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)


@@ -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


@@ -329,11 +342,8 @@ bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
 }
 
 
 }
 
 

-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 '%'


@@ -358,32 +368,18 @@ bool wxFileTypeImpl::GetIcon(wxIcon *icon,
                 strIndex = wxT("0");
             }
 
                 strIndex = wxT("0");
             }
 

-            wxString strExpPath = wxExpandEnvVars(strFullPath);
-            // here we need C based counting!
-            int nIndex = wxAtoi(strIndex) - 1 ;
-
-            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;
 }
 


@@ -393,9 +389,9 @@ 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) ) {
+        if ( key.QueryValue(wxEmptyString, *desc) ) {

             return TRUE;
         }
     }
             return TRUE;
         }
     }


@@ -430,9 +426,9 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext)
 
     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);
         }


@@ -453,6 +449,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext)
     return CreateFileType(wxEmptyString, ext);
 }
 
     return CreateFileType(wxEmptyString, ext);
 }
 

+/*

 wxFileType *
 wxMimeTypesManagerImpl::GetOrAllocateFileTypeFromExtension(const wxString& ext)
 {
 wxFileType *
 wxMimeTypesManagerImpl::GetOrAllocateFileTypeFromExtension(const wxString& ext)
 {


@@ -464,7 +461,7 @@ wxMimeTypesManagerImpl::GetOrAllocateFileTypeFromExtension(const wxString& ext)
 
     return fileType;
 }
 
     return fileType;
 }

-
+*/

 
 // MIME type -> extension -> file type
 wxFileType *
 
 // MIME type -> extension -> file type
 wxFileType *


@@ -478,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);
         }


@@ -515,31 +512,36 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
     wxCHECK_MSG( !ftInfo.GetExtensions().IsEmpty(), NULL,
                  _T("Associate() needs extension") );
 
     wxCHECK_MSG( !ftInfo.GetExtensions().IsEmpty(), NULL,
                  _T("Associate() needs extension") );
 

-    const wxString& ext = ftInfo.GetExtensions()[0u];
+    bool ok;
+    int iExtCount = 0 ;
+    wxString filetype;
+    wxString extWithDot;
+
+    wxString ext = ftInfo.GetExtensions()[iExtCount];

 
     wxCHECK_MSG( !ext.empty(), NULL,
                  _T("Associate() needs non empty extension") );
 
 
     wxCHECK_MSG( !ext.empty(), NULL,
                  _T("Associate() needs non empty extension") );
 

-    wxString extWithDot;

     if ( ext[0u] != _T('.') )
         extWithDot = _T('.');
     extWithDot += ext;
 
     if ( ext[0u] != _T('.') )
         extWithDot = _T('.');
     extWithDot += ext;
 

+    // start by setting the HKCR\\.ext entries
+    // default is filetype; content type is mimetype
+    const wxString& filetypeOrig = ftInfo.GetShortDesc();
+

     wxRegKey key(wxRegKey::HKCR, extWithDot);
     wxRegKey key(wxRegKey::HKCR, extWithDot);

-    wxFileType *ft = NULL;

     if ( !key.Exists() )
     {
     if ( !key.Exists() )
     {

-        wxString filetype;
-

         // create the mapping from the extension to the filetype
         // create the mapping from the extension to the filetype

-        bool ok = key.Create();
+        ok = key.Create();

         if ( ok )
         {
         if ( ok )
         {

-            const wxString& filetypeOrig = ftInfo.GetShortDesc();
+

             if ( filetypeOrig.empty() )
             {
                 // make it up from the extension
             if ( filetypeOrig.empty() )
             {
                 // make it up from the extension

-                filetype << extWithDot.c_str() + 1 << _T("_auto_file");
+                filetype << extWithDot.c_str() + 1 << _T("_file");

             }
             else
             {
             }
             else
             {


@@ -547,11 +549,25 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
                 filetype = filetypeOrig;
             }
 
                 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.QueryValue(wxEmptyString, filetype);
+                }
+        }
+        // now set a mimetypeif we have it, but ignore it if none

         const wxString& mimetype = ftInfo.GetMimeType();
         const wxString& mimetype = ftInfo.GetMimeType();

-        if ( ok && !mimetype.empty() )
+        if ( !mimetype.empty() )

         {
             // set the MIME type
             ok = key.SetValue(_T("Content Type"), mimetype);
         {
             // set the MIME type
             ok = key.SetValue(_T("Content Type"), mimetype);


@@ -567,41 +583,73 @@ 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
+
+    for (iExtCount=1; iExtCount < ftInfo.GetExtensionsCount(); iExtCount++ )
+        {
+            ext = ftInfo.GetExtensions()[iExtCount];
+            if ( ext[0u] != _T('.') )
+               extWithDot = _T('.');
+            extWithDot += ext;
+
+            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);
+

         if ( ok )
         {
         if ( ok )
         {

-            // 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();
-        }
+                // create the MIME key
+                wxString strKey = MIME_DATABASE_KEY;
+                strKey << mimetype;
+                wxRegKey keyMIME(wxRegKey::HKCR, strKey);
+                ok = keyMIME.Create();

 
         if ( ok )
         {
 
         if ( ok )
         {

-            // ok, we've created everything correctly
-            ft = m_impl->CreateFileType(filetype, extWithDot);
+                    // and provide a back link to the extension
+                    keyMIME.SetValue(_T("Extension"), extWithDot);

         }
         }

-        else
-        {
-           // one of the registry operations failed
-            wxLogError(_("Failed to register extension '%s'."), ext.c_str());

         }
     }
         }
     }

-    else // key already exists
+
+
+    } // 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);
+    keyFT.Create();
+
+    wxFileType *ft = CreateFileType(filetype, extWithDot);
+
+    if (ft)

     {
     {

-        // FIXME we probably should return an existing file type then?
-    }
+            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() );

 
 

+        }

     return ft;
 }
 
 bool wxFileTypeImpl::SetCommand(const wxString& cmd,
                                 const wxString& verb,
     return ft;
 }
 
 bool wxFileTypeImpl::SetCommand(const wxString& cmd,
                                 const wxString& verb,

-                                bool overwriteprompt)
+                                bool WXUNUSED(overwriteprompt))

 {
     wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), FALSE,
                  _T("SetCommand() needs an extension and a verb") );
 {
     wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), FALSE,
                  _T("SetCommand() needs an extension and a verb") );


@@ -610,18 +658,18 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd,
         return FALSE;
 
     wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb));
         return FALSE;
 
     wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb));

-
+#if 0

     if ( rkey.Exists() && overwriteprompt )
     {
 #if wxUSE_GUI
         wxString old;
     if ( rkey.Exists() && overwriteprompt )
     {
 #if wxUSE_GUI
         wxString old;

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

         if ( wxMessageBox
              (
                 wxString::Format(
                     _("Do you want to overwrite the command used to %s "
         if ( wxMessageBox
              (
                 wxString::Format(
                     _("Do you want to overwrite the command used to %s "

-                      "files with extension \"%s\" (current value is '%s', "
-                      "new value is '%s')?"),
+                      "files with extension \"%s\" ?\nCurrent value is \n%s, "
+                      "\nNew value is \n%s %1"), // bug here FIX need %1 ??

                     verb.c_str(),
                     m_ext.c_str(),
                     old.c_str(),
                     verb.c_str(),
                     m_ext.c_str(),
                     old.c_str(),


@@ -635,13 +683,14 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd,
             return FALSE;
         }
     }
             return FALSE;
         }
     }

-
+#endif

     // TODO:
     // 1. translate '%s' to '%1' instead of always adding it
     // 2. create DDEExec value if needed (undo GetCommand)
     // 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)
 {
     wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("SetMimeType() needs extension") );
 bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig)
 {
     wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("SetMimeType() needs extension") );


@@ -666,11 +715,14 @@ bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig)
     wxRegKey rkey(wxRegKey::HKCR, m_ext);
     return rkey.Create() && rkey.SetValue(_T("Content Type"), mimeType);
 }
     wxRegKey rkey(wxRegKey::HKCR, m_ext);
     return rkey.Create() && rkey.SetValue(_T("Content Type"), mimeType);
 }

+*/

 
 bool wxFileTypeImpl::SetDefaultIcon(const wxString& cmd, int index)
 {
 
 bool wxFileTypeImpl::SetDefaultIcon(const wxString& cmd, int index)
 {

-    wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("SetMimeType() needs extension") );
-    wxCHECK_MSG( wxFileExists(cmd), FALSE, _T("Icon file not found.") );
+    wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("SetDefaultIcon() needs extension") );
+    wxCHECK_MSG( !m_strFileType.IsEmpty(), FALSE, _T("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.") );

 
     if ( !EnsureExtKeyExists() )
         return FALSE;
 
     if ( !EnsureExtKeyExists() )
         return FALSE;


@@ -678,10 +730,24 @@ bool wxFileTypeImpl::SetDefaultIcon(const wxString& cmd, int index)
     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));
 }
 
                          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") );
+
+    if ( !EnsureExtKeyExists() )
+        return FALSE;
+
+    wxRegKey rkey(wxRegKey::HKCR, m_strFileType );
+
+    return rkey.Create() &&
+           rkey.SetValue(wxEmptyString, desc);
+}
+

 // ----------------------------------------------------------------------------
 // remove file association
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // remove file association
 // ----------------------------------------------------------------------------


@@ -695,7 +761,11 @@ bool wxFileTypeImpl::Unassociate()
         result = FALSE;
     if ( !RemoveMimeType() )
         result = FALSE;
         result = FALSE;
     if ( !RemoveMimeType() )
         result = FALSE;

+   if ( !RemoveDescription() )
+        result = FALSE;

 
 

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

     if ( result )
     {
         // delete the root key
     if ( result )
     {
         // delete the root key


@@ -703,7 +773,7 @@ bool wxFileTypeImpl::Unassociate()
         if ( key.Exists() )
             result = key.DeleteSelf();
     }
         if ( key.Exists() )
             result = key.DeleteSelf();
     }

-
+*/

     return result;
 }
 
     return result;
 }
 


@@ -741,5 +811,13 @@ bool wxFileTypeImpl::RemoveDefaultIcon()
     return !rkey.Exists() || rkey.DeleteSelf();
 }
 
     return !rkey.Exists() || rkey.DeleteSelf();
 }
 

-#endif
-  // __WIN16__
+bool wxFileTypeImpl::RemoveDescription()
+{
+    wxCHECK_MSG( !m_ext.IsEmpty(), FALSE,
+                 _T("RemoveDescription() needs extension") );
+
+    wxRegKey rkey (wxRegKey::HKCR, m_strFileType );
+    return !rkey.Exists() || rkey.DeleteSelf();
+}
+
+#endif // wxUSE_MIMETYPE