Fix compilation under dll builds. Wrap source files in wxUSE_WEB checks to allow...

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

diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp
index e10c79bd5171871e38fdd8387be381affe537487..a067ac7de3b567a80f831d107b2a04a8abe404cf 100644 (file)
--- a/src/msw/mimetype.cpp
+++ b/src/msw/mimetype.cpp
@@ -95,13 +95,22 @@ static bool CanonicalizeParams(wxString& command)
         }
     }
 
         }
     }
 

+    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)
     return foundFilename;
 }
 
 void wxFileTypeImpl::Init(const wxString& strFileType, const wxString& ext)
 {
     // VZ: does it? (FIXME)

-    wxCHECK_RET( !ext.empty(), _T("needs an extension") );
+    wxCHECK_RET( !ext.empty(), wxT("needs an extension") );

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


@@ -110,14 +119,14 @@ void wxFileTypeImpl::Init(const wxString& strFileType, const wxString& ext)
 
     m_strFileType = strFileType;
     if ( !strFileType ) {
 
     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;
     }
 }
 
 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;
 }
 
     return path;
 }
 


@@ -125,7 +134,7 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs,
                                       wxArrayString *commands,
                                       const wxFileType::MessageParameters& params) const
 {
                                       wxArrayString *commands,
                                       const wxFileType::MessageParameters& params) const
 {

-    wxCHECK_MSG( !m_ext.empty(), 0, _T("GetAllCommands() needs an extension") );
+    wxCHECK_MSG( !m_ext.empty(), 0, wxT("GetAllCommands() needs an extension") );

 
     if ( m_strFileType.empty() )
     {
 
     if ( m_strFileType.empty() )
     {


@@ -134,7 +143,7 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs,
         wxRegKey rkey(wxRegKey::HKCR, m_ext);
         if ( !rkey.Exists() || !rkey.QueryValue(wxEmptyString, self->m_strFileType) )
         {
         wxRegKey rkey(wxRegKey::HKCR, m_ext);
         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;
                        m_ext.c_str());
 
             return 0;


@@ -143,7 +152,7 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs,
 
     // enum all subkeys of HKCR\filetype\shell
     size_t count = 0;
 
     // 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);
     long dummy;
     wxString verb;
     bool ok = rkey.GetFirstKey(verb, dummy);


@@ -153,7 +162,7 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs,
 
         // we want the open bverb to eb always the first
 
 
         // 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);
         {
             if ( verbs )
                 verbs->Insert(verb, 0);


@@ -232,13 +241,13 @@ wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
         }
     }
 
         }
     }
 

-    if (!strKey && wxRegKey(wxRegKey::HKCR, m_ext + _T("\\shell")).Exists())
+    if (!strKey && wxRegKey(wxRegKey::HKCR, m_ext + wxT("\\shell")).Exists())

         strKey = m_ext;
 
     if ( !strKey && !m_strFileType.empty())
     {
         wxString fileType = wxFileTypeImplGetCurVer(m_strFileType);
         strKey = m_ext;
 
     if ( !strKey && !m_strFileType.empty())
     {
         wxString fileType = wxFileTypeImplGetCurVer(m_strFileType);

-        if (wxRegKey(wxRegKey::HKCR, fileType + _T("\\shell")).Exists())
+        if (wxRegKey(wxRegKey::HKCR, fileType + wxT("\\shell")).Exists())

             strKey = fileType;
     }
 
             strKey = fileType;
     }
 


@@ -249,7 +258,7 @@ wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
     }
 
     strKey << wxT("\\shell\\") << verb;
     }
 
     strKey << wxT("\\shell\\") << verb;

-    wxRegKey key(wxRegKey::HKCR, strKey + _T("\\command"));
+    wxRegKey key(wxRegKey::HKCR, strKey + wxT("\\command"));

     wxString command;
     if ( key.Open(wxRegKey::Read) ) {
         // it's the default value of the key
     wxString command;
     if ( key.Open(wxRegKey::Read) ) {
         // it's the default value of the key


@@ -259,16 +268,16 @@ wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
 #if wxUSE_IPC
             // look whether we must issue some DDE requests to the application
             // (and not just launch it)
 #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(wxRegKey::Read) ) {
                 wxString ddeCommand, ddeServer, ddeTopic;
                 keyDDE.QueryValue(wxEmptyString, ddeCommand);
             wxRegKey keyDDE(wxRegKey::HKCR, strKey);
             if ( keyDDE.Open(wxRegKey::Read) ) {
                 wxString ddeCommand, ddeServer, ddeTopic;
                 keyDDE.QueryValue(wxEmptyString, ddeCommand);

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

 
 

-                wxRegKey keyServer(wxRegKey::HKCR, strKey + _T("\\Application"));
+                wxRegKey keyServer(wxRegKey::HKCR, strKey + wxT("\\Application"));

                 keyServer.QueryValue(wxEmptyString, ddeServer);
                 keyServer.QueryValue(wxEmptyString, ddeServer);

-                wxRegKey keyTopic(wxRegKey::HKCR, strKey + _T("\\Topic"));
+                wxRegKey keyTopic(wxRegKey::HKCR, strKey + wxT("\\Topic"));

                 keyTopic.QueryValue(wxEmptyString, ddeTopic);
 
                 if (ddeTopic.empty())
                 keyTopic.QueryValue(wxEmptyString, ddeTopic);
 
                 if (ddeTopic.empty())


@@ -277,10 +286,10 @@ wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
                 // 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
                 // 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
             }
             else
 #endif // wxUSE_IPC


@@ -538,7 +547,7 @@ size_t wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString& mimetypes)
 wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
 {
     wxCHECK_MSG( !ftInfo.GetExtensions().empty(), NULL,
 wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
 {
     wxCHECK_MSG( !ftInfo.GetExtensions().empty(), NULL,

-                 _T("Associate() needs extension") );
+                 wxT("Associate() needs extension") );

 
     bool ok;
     size_t iExtCount = 0;
 
     bool ok;
     size_t iExtCount = 0;


@@ -548,10 +557,10 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
     wxString ext = ftInfo.GetExtensions()[iExtCount];
 
     wxCHECK_MSG( !ext.empty(), NULL,
     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
     extWithDot += ext;
 
     // start by setting the HKCR\\.ext entries


@@ -569,7 +578,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
             if ( filetypeOrig.empty() )
             {
                 // make it up from the extension
             if ( filetypeOrig.empty() )
             {
                 // make it up from the extension

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

             }
             else
             {
             }
             else
             {


@@ -599,7 +608,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
     if ( !mimetype.empty() )
     {
         // set the MIME type
     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 )
         {


@@ -612,7 +621,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

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

             }
         }
     }
             }
         }
     }


@@ -623,8 +632,8 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
     for (iExtCount=1; iExtCount < ftInfo.GetExtensionsCount(); iExtCount++ )
     {
         ext = ftInfo.GetExtensions()[iExtCount];
     for (iExtCount=1; iExtCount < ftInfo.GetExtensionsCount(); iExtCount++ )
     {
         ext = ftInfo.GetExtensions()[iExtCount];

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

         extWithDot += ext;
 
         wxRegKey key(wxRegKey::HKCR, extWithDot);
         extWithDot += ext;
 
         wxRegKey key(wxRegKey::HKCR, extWithDot);


@@ -636,7 +645,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
         if ( !mimetype.empty() )
         {
             // set the MIME type
         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 )
             {


@@ -649,7 +658,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

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

                 }
             }
         }
                 }
             }
         }


@@ -681,7 +690,7 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd,
                                 bool WXUNUSED(overwriteprompt))
 {
     wxCHECK_MSG( !m_ext.empty() && !verb.empty(), false,
                                 bool WXUNUSED(overwriteprompt))
 {
     wxCHECK_MSG( !m_ext.empty() && !verb.empty(), false,

-                 _T("SetCommand() needs an extension and a verb") );
+                 wxT("SetCommand() needs an extension and a verb") );

 
     if ( !EnsureExtKeyExists() )
         return false;
 
     if ( !EnsureExtKeyExists() )
         return false;


@@ -716,13 +725,13 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd,
     // 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(wxEmptyString, cmd + _T(" \"%1\"") );
+    return rkey.Create() && rkey.SetValue(wxEmptyString, cmd + wxT(" \"%1\"") );

 }
 
 /* // no longer used
 bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig)
 {
 }
 
 /* // no longer used
 bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig)
 {

-    wxCHECK_MSG( !m_ext.empty(), false, _T("SetMimeType() needs extension") );
+    wxCHECK_MSG( !m_ext.empty(), false, wxT("SetMimeType() needs extension") );

 
     if ( !EnsureExtKeyExists() )
         return false;
 
     if ( !EnsureExtKeyExists() )
         return false;


@@ -733,8 +742,8 @@ bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig)
     {
         // make up a default value for it
         wxString cmd;
     {
         // 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
     {
     }
     else
     {


@@ -742,31 +751,31 @@ bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig)
     }
 
     wxRegKey rkey(wxRegKey::HKCR, m_ext);
     }
 
     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)
 {
 }
 */
 
 bool wxFileTypeImpl::SetDefaultIcon(const wxString& cmd, int index)
 {

-    wxCHECK_MSG( !m_ext.empty(), false, _T("SetDefaultIcon() needs extension") );
-    wxCHECK_MSG( !m_strFileType.empty(), 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
 //    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;
 
 
     if ( !EnsureExtKeyExists() )
         return false;
 

-    wxRegKey rkey(wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon"));
+    wxRegKey rkey(wxRegKey::HKCR, m_strFileType + wxT("\\DefaultIcon"));

 
     return rkey.Create() &&
            rkey.SetValue(wxEmptyString,
 
     return rkey.Create() &&
            rkey.SetValue(wxEmptyString,

-                         wxString::Format(_T("%s,%d"), cmd.c_str(), index));
+                         wxString::Format(wxT("%s,%d"), cmd.c_str(), index));

 }
 
 bool wxFileTypeImpl::SetDescription (const wxString& desc)
 {
 }
 
 bool wxFileTypeImpl::SetDescription (const wxString& desc)
 {

-    wxCHECK_MSG( !m_strFileType.empty(), false, _T("File key not found") );
-    wxCHECK_MSG( !desc.empty(), 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;
 
     if ( !EnsureExtKeyExists() )
         return false;


@@ -808,13 +817,13 @@ bool wxFileTypeImpl::Unassociate()
 
 bool wxFileTypeImpl::RemoveOpenCommand()
 {
 
 bool wxFileTypeImpl::RemoveOpenCommand()
 {

-   return RemoveCommand(_T("open"));
+   return RemoveCommand(wxT("open"));

 }
 
 bool wxFileTypeImpl::RemoveCommand(const wxString& verb)
 {
     wxCHECK_MSG( !m_ext.empty() && !verb.empty(), false,
 }
 
 bool wxFileTypeImpl::RemoveCommand(const wxString& verb)
 {
     wxCHECK_MSG( !m_ext.empty() && !verb.empty(), false,

-                 _T("RemoveCommand() needs an extension and a verb") );
+                 wxT("RemoveCommand() needs an extension and a verb") );

 
     wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb));
 
 
     wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb));
 


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

-    wxCHECK_MSG( !m_ext.empty(), 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();
 
     wxRegKey rkey(wxRegKey::HKCR, m_ext);
     return !rkey.Exists() || rkey.DeleteSelf();


@@ -833,16 +842,16 @@ bool wxFileTypeImpl::RemoveMimeType()
 bool wxFileTypeImpl::RemoveDefaultIcon()
 {
     wxCHECK_MSG( !m_ext.empty(), false,
 bool wxFileTypeImpl::RemoveDefaultIcon()
 {
     wxCHECK_MSG( !m_ext.empty(), false,

-                 _T("RemoveDefaultIcon() needs extension") );
+                 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.empty(), false,
     return !rkey.Exists() || rkey.DeleteSelf();
 }
 
 bool wxFileTypeImpl::RemoveDescription()
 {
     wxCHECK_MSG( !m_ext.empty(), false,

-                 _T("RemoveDescription() needs extension") );
+                 wxT("RemoveDescription() needs extension") );

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