X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c3afc422403767a0e8c0310c0bee436f096193a..2fb18bf45bcf391a8eb973886072dc67893e9bbe:/src/msw/mimetype.cpp diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp index c4e8974a98..89a5f9e82e 100644 --- a/src/msw/mimetype.cpp +++ b/src/msw/mimetype.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence (part of wxExtra library) ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "mimetype.h" -#endif - // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -104,7 +100,7 @@ static bool CanonicalizeParams(wxString& command) void wxFileTypeImpl::Init(const wxString& strFileType, const wxString& ext) { // VZ: does it? (FIXME) - wxCHECK_RET( !ext.IsEmpty(), _T("needs an extension") ); + wxCHECK_RET( !ext.empty(), _T("needs an extension") ); if ( ext[0u] != wxT('.') ) { m_ext = wxT('.'); @@ -128,9 +124,9 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs, wxArrayString *commands, const wxFileType::MessageParameters& params) const { - wxCHECK_MSG( !m_ext.IsEmpty(), 0, _T("GetAllCommands() needs an extension") ); + wxCHECK_MSG( !m_ext.empty(), 0, _T("GetAllCommands() needs an extension") ); - if ( m_strFileType.IsEmpty() ) + if ( m_strFileType.empty() ) { // get it from the registry wxFileTypeImpl *self = wxConstCast(this, wxFileTypeImpl); @@ -192,11 +188,11 @@ bool wxFileTypeImpl::EnsureExtKeyExists() { wxLogError(_("Failed to create registry entry for '%s' files."), m_ext.c_str()); - return FALSE; + return false; } } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -238,12 +234,12 @@ wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const keyDDE.QueryValue(wxEmptyString, ddeCommand); ddeCommand.Replace(_T("%1"), _T("%s")); - wxRegKey(wxRegKey::HKCR, strKey + _T("\\Application")). - QueryValue(wxEmptyString, ddeServer); - wxRegKey(wxRegKey::HKCR, strKey + _T("\\Topic")). - QueryValue(wxEmptyString, ddeTopic); + wxRegKey keyServer(wxRegKey::HKCR, strKey + _T("\\Application")); + keyServer.QueryValue(wxEmptyString, ddeServer); + wxRegKey keyTopic(wxRegKey::HKCR, strKey + _T("\\Topic")); + keyTopic.QueryValue(wxEmptyString, ddeTopic); - if (ddeTopic.IsEmpty()) + if (ddeTopic.empty()) ddeTopic = wxT("System"); // HACK: we use a special feature of wxExecute which exists @@ -281,7 +277,7 @@ wxFileTypeImpl::GetOpenCommand(wxString *openCmd, *openCmd = wxFileType::ExpandCommand(cmd, params); - return !openCmd->IsEmpty(); + return !openCmd->empty(); } bool @@ -293,7 +289,7 @@ wxFileTypeImpl::GetPrintCommand(wxString *printCmd, *printCmd = wxFileType::ExpandCommand(cmd, params); - return !printCmd->IsEmpty(); + return !printCmd->empty(); } // ---------------------------------------------------------------------------- @@ -303,17 +299,17 @@ wxFileTypeImpl::GetPrintCommand(wxString *printCmd, // TODO this function is half implemented bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions) { - if ( m_ext.IsEmpty() ) { + if ( m_ext.empty() ) { // the only way to get the list of extensions from the file type is to // scan through all extensions in the registry - too slow... - return FALSE; + return false; } else { extensions.Empty(); extensions.Add(m_ext); // it's a lie too, we don't return _all_ extensions... - return TRUE; + return true; } } @@ -333,12 +329,12 @@ bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const if ( !GetMimeType(&s) ) { - return FALSE; + return false; } mimeTypes.Clear(); mimeTypes.Add(s); - return TRUE; + return true; } @@ -363,7 +359,7 @@ bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const // index may be omitted, in which case BeforeLast(',') is empty and // AfterLast(',') is the whole string - if ( strFullPath.IsEmpty() ) { + if ( strFullPath.empty() ) { strFullPath = strIndex; strIndex = wxT("0"); } @@ -375,12 +371,12 @@ bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const iconLoc->SetIndex(wxAtoi(strIndex)); } - return TRUE; + return true; } } // no such file type or no value or incorrect icon entry - return FALSE; + return false; } bool wxFileTypeImpl::GetDescription(wxString *desc) const @@ -392,11 +388,11 @@ bool wxFileTypeImpl::GetDescription(wxString *desc) const if ( key.Open(wxRegKey::Read) ) { // it's the default value of the key if ( key.QueryValue(wxEmptyString, *desc) ) { - return TRUE; + return true; } } - return FALSE; + return false; } // helper function @@ -422,7 +418,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext) // suppress possible error messages wxLogNull nolog; - bool knownExtension = FALSE; + bool knownExtension = false; wxString strFileType; wxRegKey key(wxRegKey::HKCR, str); @@ -436,7 +432,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext) // this extension doesn't have a filetype, but it's known to the // system and may be has some other useful keys (open command or // content-type), so still return a file type object for it - knownExtension = TRUE; + knownExtension = true; } } @@ -509,7 +505,7 @@ size_t wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString& mimetypes) wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) { - wxCHECK_MSG( !ftInfo.GetExtensions().IsEmpty(), NULL, + wxCHECK_MSG( !ftInfo.GetExtensions().empty(), NULL, _T("Associate() needs extension") ); bool ok; @@ -551,56 +547,57 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) 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 already exists, maybe we want to change it ?? - if (!filetypeOrig.empty()) - { - filetype = filetypeOrig; - key.SetValue(wxEmptyString, filetype); - } - else - { - key.QueryValue(wxEmptyString, filetype); - } + key.QueryValue(wxEmptyString, filetype); } - // now set a mimetypeif we have it, but ignore it if none - const wxString& mimetype = ftInfo.GetMimeType(); - if ( !mimetype.empty() ) + } + + // now set a mimetypeif we have it, 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 ) { - // set the MIME type - ok = key.SetValue(_T("Content Type"), mimetype); + // create the MIME key + wxString strKey = MIME_DATABASE_KEY; + strKey << mimetype; + wxRegKey keyMIME(wxRegKey::HKCR, strKey); + ok = keyMIME.Create(); if ( ok ) { - // create the MIME key - wxString strKey = MIME_DATABASE_KEY; - strKey << mimetype; - wxRegKey keyMIME(wxRegKey::HKCR, strKey); - ok = keyMIME.Create(); - - if ( ok ) - { - // and provide a back link to the extension - keyMIME.SetValue(_T("Extension"), extWithDot); - } + // and provide a back link to the extension + 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; + { + 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); + 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(); @@ -609,22 +606,21 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) // set the MIME type ok = key.SetValue(_T("Content Type"), mimetype); - if ( ok ) - { + if ( ok ) + { // create the MIME key wxString strKey = MIME_DATABASE_KEY; strKey << mimetype; wxRegKey keyMIME(wxRegKey::HKCR, strKey); ok = keyMIME.Create(); - if ( ok ) - { + if ( ok ) + { // and provide a back link to the extension keyMIME.SetValue(_T("Extension"), extWithDot); + } + } } - } - } - } // end of for loop; all extensions now point to HKCR\.ext\Default @@ -637,13 +633,14 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) if (ft) { - 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() ); + if (! ftInfo.GetOpenCommand ().empty() ) ft->SetCommand (ftInfo.GetOpenCommand (), wxT("open" ) ); + if (! ftInfo.GetPrintCommand().empty() ) ft->SetCommand (ftInfo.GetPrintCommand(), wxT("print" ) ); + // chris: I don't like the ->m_impl-> here FIX this ?? + if (! ftInfo.GetDescription ().empty() ) ft->m_impl->SetDescription (ftInfo.GetDescription ()) ; + if (! ftInfo.GetIconFile().empty() ) ft->SetDefaultIcon (ftInfo.GetIconFile(), ftInfo.GetIconIndex() ); + + } - } return ft; } @@ -651,11 +648,11 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd, const wxString& verb, bool WXUNUSED(overwriteprompt)) { - wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), FALSE, + wxCHECK_MSG( !m_ext.empty() && !verb.empty(), false, _T("SetCommand() needs an extension and a verb") ); if ( !EnsureExtKeyExists() ) - return FALSE; + return false; wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb)); #if 0 @@ -680,7 +677,7 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd, #endif // wxUSE_GUI { // cancelled by user - return FALSE; + return false; } } #endif @@ -693,10 +690,10 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd, /* // no longer used bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig) { - wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("SetMimeType() needs extension") ); + wxCHECK_MSG( !m_ext.empty(), false, _T("SetMimeType() needs extension") ); if ( !EnsureExtKeyExists() ) - return FALSE; + return false; // VZ: is this really useful? (FIXME) wxString mimeType; @@ -719,13 +716,13 @@ bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig) bool wxFileTypeImpl::SetDefaultIcon(const wxString& cmd, int index) { - wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("SetDefaultIcon() needs extension") ); - wxCHECK_MSG( !m_strFileType.IsEmpty(), FALSE, _T("File key not found") ); + wxCHECK_MSG( !m_ext.empty(), false, _T("SetDefaultIcon() needs extension") ); + wxCHECK_MSG( !m_strFileType.empty(), 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.") ); +// wxCHECK_MSG( !wxFileExists(cmd), false, _T("Icon file not found.") ); if ( !EnsureExtKeyExists() ) - return FALSE; + return false; wxRegKey rkey(wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon")); @@ -736,11 +733,11 @@ bool wxFileTypeImpl::SetDefaultIcon(const wxString& cmd, int 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") ); + wxCHECK_MSG( !m_strFileType.empty(), false, _T("File key not found") ); + wxCHECK_MSG( !desc.empty(), false, _T("No file description supplied") ); if ( !EnsureExtKeyExists() ) - return FALSE; + return false; wxRegKey rkey(wxRegKey::HKCR, m_strFileType ); @@ -754,15 +751,15 @@ bool wxFileTypeImpl::SetDescription (const wxString& desc) bool wxFileTypeImpl::Unassociate() { - bool result = TRUE; + bool result = true; if ( !RemoveOpenCommand() ) - result = FALSE; + result = false; if ( !RemoveDefaultIcon() ) - result = FALSE; + result = false; if ( !RemoveMimeType() ) - result = FALSE; - if ( !RemoveDescription() ) - result = FALSE; + result = false; + if ( !RemoveDescription() ) + result = false; /* //this might hold other keys, eg some have CSLID keys @@ -784,10 +781,9 @@ bool wxFileTypeImpl::RemoveOpenCommand() bool wxFileTypeImpl::RemoveCommand(const wxString& verb) { - wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), FALSE, + wxCHECK_MSG( !m_ext.empty() && !verb.empty(), false, _T("RemoveCommand() needs an extension and a verb") ); - wxString sKey = m_strFileType; wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb)); // if the key already doesn't exist, it's a success @@ -796,7 +792,7 @@ bool wxFileTypeImpl::RemoveCommand(const wxString& verb) bool wxFileTypeImpl::RemoveMimeType() { - wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("RemoveMimeType() needs extension") ); + wxCHECK_MSG( !m_ext.empty(), false, _T("RemoveMimeType() needs extension") ); wxRegKey rkey(wxRegKey::HKCR, m_ext); return !rkey.Exists() || rkey.DeleteSelf(); @@ -804,7 +800,7 @@ bool wxFileTypeImpl::RemoveMimeType() bool wxFileTypeImpl::RemoveDefaultIcon() { - wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, + wxCHECK_MSG( !m_ext.empty(), false, _T("RemoveDefaultIcon() needs extension") ); wxRegKey rkey (wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon")); @@ -813,7 +809,7 @@ bool wxFileTypeImpl::RemoveDefaultIcon() bool wxFileTypeImpl::RemoveDescription() { - wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, + wxCHECK_MSG( !m_ext.empty(), false, _T("RemoveDescription() needs extension") ); wxRegKey rkey (wxRegKey::HKCR, m_strFileType );