don't define functions unused under CE when compiling for it (avoids warnings)

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

diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp
index 8e663b816b33fb4f96da391ed8341ee0640246b4..bd6edf88f5f84fd5eac096a9ac904a91a19ada81 100644 (file)
--- a/src/msw/mimetype.cpp
+++ b/src/msw/mimetype.cpp
@@ -22,9 +22,6 @@
 
 #if wxUSE_MIMETYPE
 
 
 #if wxUSE_MIMETYPE
 

-// Doesn't compile in WIN16 mode
-#ifndef __WIN16__
-

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


@@ -77,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)


@@ -111,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());


@@ -164,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());


@@ -201,27 +225,8 @@ wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const
     wxString command;
     if ( key.Open() ) {
         // it's the default value of the key
     wxString command;
     if ( key.Open() ) {
         // 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
 
 #if wxUSE_IPC
             // look whether we must issue some DDE requests to the application


@@ -230,13 +235,13 @@ wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const
             wxRegKey keyDDE(wxRegKey::HKCR, strKey);
             if ( keyDDE.Open() ) {
                 wxString ddeCommand, ddeServer, ddeTopic;
             wxRegKey keyDDE(wxRegKey::HKCR, strKey);
             if ( keyDDE.Open() ) {
                 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");
 
                 if (ddeTopic.IsEmpty())
                     ddeTopic = wxT("System");


@@ -251,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)


@@ -347,7 +353,7 @@ bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const
     if ( key.Open() ) {
         wxString strIcon;
         // it's the default value of the key
     if ( key.Open() ) {
         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 '%'


@@ -384,7 +390,7 @@ bool wxFileTypeImpl::GetDescription(wxString *desc) const
 
     if ( key.Open() ) {
         // it's the default value of the key
 
     if ( key.Open() ) {
         // it's the default value of the key

-        if ( key.QueryValue(wxT(""), *desc) ) {
+        if ( key.QueryValue(wxEmptyString, *desc) ) {

             return TRUE;
         }
     }
             return TRUE;
         }
     }


@@ -421,7 +427,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext)
     wxRegKey key(wxRegKey::HKCR, str);
     if ( key.Open() ) {
         // it's the default value of the key
     wxRegKey key(wxRegKey::HKCR, str);
     if ( key.Open() ) {
         // 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);
         }


@@ -505,7 +511,7 @@ 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") );
 

-    bool ok = FALSE ;
+    bool ok;

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


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

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

         }
         }
         else
         }
         }
         else


@@ -551,11 +557,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


@@ -576,7 +582,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);

                 }
             }
         }
                 }
             }
         }


@@ -592,8 +598,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();


@@ -613,7 +619,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);

         }
         }
     }
         }
         }
     }


@@ -624,10 +630,9 @@ 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();
+    keyFT.Create();

 
 

-    wxFileType *ft = NULL;
-    ft = CreateFileType(filetype, extWithDot);
+    wxFileType *ft = CreateFileType(filetype, extWithDot);

 
     if (ft)
     {
 
     if (ft)
     {


@@ -657,7 +662,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(


@@ -681,7 +686,7 @@ 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(_T(""), cmd + _T(" \"%1\"") );
+    return rkey.Create() && rkey.SetValue(wxEmptyString, cmd + _T(" \"%1\"") );

 }
 
 /* // no longer used
 }
 
 /* // no longer used


@@ -724,7 +729,7 @@ 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));
 }
 


@@ -739,7 +744,7 @@ bool wxFileTypeImpl::SetDescription (const wxString& desc)
     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);

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


@@ -814,7 +819,4 @@ bool wxFileTypeImpl::RemoveDescription()
     return !rkey.Exists() || rkey.DeleteSelf();
 }
 
     return !rkey.Exists() || rkey.DeleteSelf();
 }
 

-#endif
-  // __WIN16__
-

 #endif // wxUSE_MIMETYPE
 #endif // wxUSE_MIMETYPE