Source cleaning: -1/wxID_ANY/wxDefaultCoord, ::, !!, TRUE/true, FALSE/false, whitespaces, tabs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -192,11 +192,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;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -306,14 +306,14 @@ bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
|
||||
if ( m_ext.IsEmpty() ) {
|
||||
// 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 +333,12 @@ bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
|
||||
|
||||
if ( !GetMimeType(&s) )
|
||||
{
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
|
||||
mimeTypes.Clear();
|
||||
mimeTypes.Add(s);
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -375,12 +375,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 +392,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 +422,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 +436,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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -651,11 +651,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.IsEmpty() && !verb.IsEmpty(), 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 +680,7 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd,
|
||||
#endif // wxUSE_GUI
|
||||
{
|
||||
// cancelled by user
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -693,10 +693,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.IsEmpty(), false, _T("SetMimeType() needs extension") );
|
||||
|
||||
if ( !EnsureExtKeyExists() )
|
||||
return FALSE;
|
||||
return false;
|
||||
|
||||
// VZ: is this really useful? (FIXME)
|
||||
wxString mimeType;
|
||||
@@ -719,13 +719,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.IsEmpty(), false, _T("SetDefaultIcon() needs extension") );
|
||||
wxCHECK_MSG( !m_strFileType.IsEmpty(), 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 +736,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.IsEmpty(), false, _T("File key not found") );
|
||||
wxCHECK_MSG( !desc.IsEmpty(), false, _T("No file description supplied") );
|
||||
|
||||
if ( !EnsureExtKeyExists() )
|
||||
return FALSE;
|
||||
return false;
|
||||
|
||||
wxRegKey rkey(wxRegKey::HKCR, m_strFileType );
|
||||
|
||||
@@ -754,15 +754,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;
|
||||
result = false;
|
||||
if ( !RemoveDescription() )
|
||||
result = FALSE;
|
||||
result = false;
|
||||
|
||||
/*
|
||||
//this might hold other keys, eg some have CSLID keys
|
||||
@@ -784,7 +784,7 @@ bool wxFileTypeImpl::RemoveOpenCommand()
|
||||
|
||||
bool wxFileTypeImpl::RemoveCommand(const wxString& verb)
|
||||
{
|
||||
wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), FALSE,
|
||||
wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), false,
|
||||
_T("RemoveCommand() needs an extension and a verb") );
|
||||
|
||||
wxString sKey = m_strFileType;
|
||||
@@ -796,7 +796,7 @@ bool wxFileTypeImpl::RemoveCommand(const wxString& verb)
|
||||
|
||||
bool wxFileTypeImpl::RemoveMimeType()
|
||||
{
|
||||
wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("RemoveMimeType() needs extension") );
|
||||
wxCHECK_MSG( !m_ext.IsEmpty(), false, _T("RemoveMimeType() needs extension") );
|
||||
|
||||
wxRegKey rkey(wxRegKey::HKCR, m_ext);
|
||||
return !rkey.Exists() || rkey.DeleteSelf();
|
||||
@@ -804,7 +804,7 @@ bool wxFileTypeImpl::RemoveMimeType()
|
||||
|
||||
bool wxFileTypeImpl::RemoveDefaultIcon()
|
||||
{
|
||||
wxCHECK_MSG( !m_ext.IsEmpty(), FALSE,
|
||||
wxCHECK_MSG( !m_ext.IsEmpty(), false,
|
||||
_T("RemoveDefaultIcon() needs extension") );
|
||||
|
||||
wxRegKey rkey (wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon"));
|
||||
@@ -813,7 +813,7 @@ bool wxFileTypeImpl::RemoveDefaultIcon()
|
||||
|
||||
bool wxFileTypeImpl::RemoveDescription()
|
||||
{
|
||||
wxCHECK_MSG( !m_ext.IsEmpty(), FALSE,
|
||||
wxCHECK_MSG( !m_ext.IsEmpty(), false,
|
||||
_T("RemoveDescription() needs extension") );
|
||||
|
||||
wxRegKey rkey (wxRegKey::HKCR, m_strFileType );
|
||||
|
Reference in New Issue
Block a user