X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/999836aacade840a5d9a0cbb5fad7b1d4de62c93..a24dc1a836159cbec24c577d9e576f8dbafad728:/src/msw/mimetype.cpp

diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp
index 78eb544ea9..711023e813 100644
--- a/src/msw/mimetype.cpp
+++ b/src/msw/mimetype.cpp
@@ -22,9 +22,6 @@
 
 #if wxUSE_MIMETYPE
 
-// Doesn't compile in WIN16 mode
-#ifndef __WIN16__
-
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #if wxUSE_GUI
@@ -226,7 +223,7 @@ wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const
     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
         if ( key.QueryValue(wxEmptyString, command) ) {
             bool foundFilename = CanonicalizeParams(command);
@@ -236,7 +233,7 @@ wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const
             // (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;
                 keyDDE.QueryValue(wxEmptyString, ddeCommand);
                 ddeCommand.Replace(_T("%1"), _T("%s"));
@@ -326,7 +323,8 @@ bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const
     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
@@ -353,7 +351,7 @@ bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const
     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
         if ( key.QueryValue(wxEmptyString, strIcon) ) {
@@ -391,7 +389,7 @@ bool wxFileTypeImpl::GetDescription(wxString *desc) const
     wxLogNull nolog;
     wxRegKey key(wxRegKey::HKCR, m_strFileType);
 
-    if ( key.Open() ) {
+    if ( key.Open(wxRegKey::Read) ) {
         // it's the default value of the key
         if ( key.QueryValue(wxEmptyString, *desc) ) {
             return TRUE;
@@ -428,7 +426,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext)
 
     wxString strFileType;
     wxRegKey key(wxRegKey::HKCR, str);
-    if ( key.Open() ) {
+    if ( key.Open(wxRegKey::Read) ) {
         // it's the default value of the key
         if ( key.QueryValue(wxEmptyString, strFileType) ) {
             // create the new wxFileType object
@@ -477,7 +475,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mimeType)
 
     wxString ext;
     wxRegKey key(wxRegKey::HKCR, strKey);
-    if ( key.Open() ) {
+    if ( key.Open(wxRegKey::Read) ) {
         if ( key.QueryValue(wxT("Extension"), ext) ) {
             return GetFileTypeFromExtension(ext);
         }
@@ -822,7 +820,4 @@ bool wxFileTypeImpl::RemoveDescription()
     return !rkey.Exists() || rkey.DeleteSelf();
 }
 
-#endif
-  // __WIN16__
-
 #endif // wxUSE_MIMETYPE