Applied patch [ 571965 ] update stc contrib stuff

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

diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp
index a73c5150e013342f59d96fe8fdbfb5d0608eab92..53a0551e81464ef09a9482d966ff07778ff8778a 100644 (file)
--- a/src/msw/mimetype.cpp
+++ b/src/msw/mimetype.cpp
@@ -20,7 +20,9 @@
   #pragma hdrstop
 #endif
 
-// this is Win32 only code
+#if wxUSE_MIMETYPE
+
+// Doesn't compile in WIN16 mode
 #ifndef __WIN16__
 
 #ifndef WX_PRECOMP
@@ -594,7 +596,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
 
 
     // now make other extensions have the same filetype
-    
+
     for (iExtCount=1; iExtCount < ftInfo.GetExtensionsCount(); iExtCount++ )
         {
             ext = ftInfo.GetExtensions()[iExtCount];
@@ -636,8 +638,8 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
     // SetCommand(), SetDefaultIcon() &c will use it later)
     wxRegKey keyFT(wxRegKey::HKCR, filetype);
     ok = keyFT.Create();
-    
-    wxFileType *ft = NULL; 
+
+    wxFileType *ft = NULL;
     ft = CreateFileType(filetype, extWithDot);
 
     if (ft)
@@ -654,7 +656,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
 
 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") );
@@ -827,3 +829,5 @@ bool wxFileTypeImpl::RemoveDescription()
 
 #endif
   // __WIN16__
+
+#endif // wxUSE_MIMETYPE