X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..e795e8b56f213f97745636a017609091746894a0:/src/common/mimecmn.cpp diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp index fc33f0802d..4afd332148 100644 --- a/src/common/mimecmn.cpp +++ b/src/common/mimecmn.cpp @@ -7,7 +7,7 @@ // Created: 23.09.98 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWidgets licence (part of wxExtra library) +// Licence: wxWindows licence (part of wxExtra library) ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -18,10 +18,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "mimetypebase.h" -#endif - // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -56,6 +52,8 @@ #elif defined(__WXPM__) || defined (__EMX__) #include "wx/os2/mimetype.h" #undef __UNIX__ +#elif defined(__DOS__) + #include "wx/msdos/mimetype.h" #else // Unix #include "wx/unix/mimetype.h" #endif @@ -83,7 +81,17 @@ wxFileTypeInfo::wxFileTypeInfo(const wxChar *mimeType, for ( ;; ) { + // icc gives this warning in its own va_arg() macro, argh +#ifdef __INTELC__ + #pragma warning(push) + #pragma warning(disable: 1684) +#endif + const wxChar *ext = va_arg(argptr, const wxChar *); + +#ifdef __INTELC__ + #pragma warning(pop) +#endif if ( !ext ) { // NULL terminates the list @@ -112,7 +120,7 @@ wxFileTypeInfo::wxFileTypeInfo(const wxArrayString& sArray) } #include "wx/arrimpl.cpp" -WX_DEFINE_OBJARRAY(wxArrayFileTypeInfo); +WX_DEFINE_OBJARRAY(wxArrayFileTypeInfo) // ============================================================================ // implementation of the wrapper classes @@ -126,7 +134,7 @@ WX_DEFINE_OBJARRAY(wxArrayFileTypeInfo); wxString wxFileType::ExpandCommand(const wxString& command, const wxFileType::MessageParameters& params) { - bool hasFilename = FALSE; + bool hasFilename = false; wxString str; for ( const wxChar *pc = command.c_str(); *pc != wxT('\0'); pc++ ) { @@ -144,7 +152,7 @@ wxString wxFileType::ExpandCommand(const wxString& command, str << wxT('"') << params.GetFileName() << wxT('"'); #endif str << params.GetFileName(); - hasFilename = TRUE; + hasFilename = true; break; case wxT('t'): @@ -196,7 +204,7 @@ wxString wxFileType::ExpandCommand(const wxString& command, // know of the correct solution, try to guess what we have to do. // test now carried out on reading file so test should never get here - if ( !hasFilename && !str.IsEmpty() + if ( !hasFilename && !str.empty() #ifdef __UNIX__ && !str.StartsWith(_T("test ")) #endif // Unix @@ -230,7 +238,7 @@ bool wxFileType::GetExtensions(wxArrayString& extensions) if ( m_info ) { extensions = m_info->GetExtensions(); - return TRUE; + return true; } return m_impl->GetExtensions(extensions); @@ -238,13 +246,13 @@ bool wxFileType::GetExtensions(wxArrayString& extensions) bool wxFileType::GetMimeType(wxString *mimeType) const { - wxCHECK_MSG( mimeType, FALSE, _T("invalid parameter in GetMimeType") ); + wxCHECK_MSG( mimeType, false, _T("invalid parameter in GetMimeType") ); if ( m_info ) { *mimeType = m_info->GetMimeType(); - return TRUE; + return true; } return m_impl->GetMimeType(mimeType); @@ -257,7 +265,7 @@ bool wxFileType::GetMimeTypes(wxArrayString& mimeTypes) const mimeTypes.Clear(); mimeTypes.Add(m_info->GetMimeType()); - return TRUE; + return true; } return m_impl->GetMimeTypes(mimeTypes); @@ -275,7 +283,7 @@ bool wxFileType::GetIcon(wxIconLocation *iconLoc) const #endif // __WXMSW__ } - return TRUE; + return true; } return m_impl->GetIcon(iconLoc); @@ -302,13 +310,13 @@ wxFileType::GetIcon(wxIconLocation *iconloc, bool wxFileType::GetDescription(wxString *desc) const { - wxCHECK_MSG( desc, FALSE, _T("invalid parameter in GetDescription") ); + wxCHECK_MSG( desc, false, _T("invalid parameter in GetDescription") ); if ( m_info ) { *desc = m_info->GetDescription(); - return TRUE; + return true; } return m_impl->GetDescription(desc); @@ -318,13 +326,13 @@ bool wxFileType::GetOpenCommand(wxString *openCmd, const wxFileType::MessageParameters& params) const { - wxCHECK_MSG( openCmd, FALSE, _T("invalid parameter in GetOpenCommand") ); + wxCHECK_MSG( openCmd, false, _T("invalid parameter in GetOpenCommand") ); if ( m_info ) { *openCmd = ExpandCommand(m_info->GetOpenCommand(), params); - return TRUE; + return true; } return m_impl->GetOpenCommand(openCmd, params); @@ -346,13 +354,13 @@ bool wxFileType::GetPrintCommand(wxString *printCmd, const wxFileType::MessageParameters& params) const { - wxCHECK_MSG( printCmd, FALSE, _T("invalid parameter in GetPrintCommand") ); + wxCHECK_MSG( printCmd, false, _T("invalid parameter in GetPrintCommand") ); if ( m_info ) { *printCmd = ExpandCommand(m_info->GetPrintCommand(), params); - return TRUE; + return true; } return m_impl->GetPrintCommand(printCmd, params); @@ -406,18 +414,22 @@ bool wxFileType::Unassociate() return m_impl->Unassociate(this); #else wxFAIL_MSG( _T("not implemented") ); // TODO - return FALSE; + return false; #endif } -bool wxFileType::SetCommand(const wxString& cmd, const wxString& verb, -bool overwriteprompt) +bool wxFileType::SetCommand(const wxString& cmd, + const wxString& verb, + bool overwriteprompt) { #if defined (__WXMSW__) || defined(__UNIX__) return m_impl->SetCommand(cmd, verb, overwriteprompt); #else + wxUnusedVar(cmd); + wxUnusedVar(verb); + wxUnusedVar(overwriteprompt); wxFAIL_MSG(_T("not implemented")); - return FALSE; + return false; #endif } @@ -428,16 +440,16 @@ bool wxFileType::SetDefaultIcon(const wxString& cmd, int index) // VZ: should we do this? // chris elliott : only makes sense in MS windows if ( sTmp.empty() ) - GetOpenCommand(&sTmp, wxFileType::MessageParameters(wxT(""), wxT(""))); + GetOpenCommand(&sTmp, wxFileType::MessageParameters(wxEmptyString, wxEmptyString)); #endif - wxCHECK_MSG( !sTmp.empty(), FALSE, _T("need the icon file") ); + wxCHECK_MSG( !sTmp.empty(), false, _T("need the icon file") ); #if defined (__WXMSW__) || defined(__UNIX__) return m_impl->SetDefaultIcon (cmd, index); #else + wxUnusedVar(index); wxFAIL_MSG(_T("not implemented")); - - return FALSE; + return false; #endif } @@ -458,21 +470,21 @@ bool wxMimeTypesManager::IsOfType(const wxString& mimeType, wxASSERT_MSG( mimeType.Find(wxT('*')) == wxNOT_FOUND, wxT("first MIME type can't contain wildcards") ); - // all comparaisons are case insensitive (2nd arg of IsSameAs() is FALSE) + // all comparaisons are case insensitive (2nd arg of IsSameAs() is false) if ( wildcard.BeforeFirst(wxT('/')). - IsSameAs(mimeType.BeforeFirst(wxT('/')), FALSE) ) + IsSameAs(mimeType.BeforeFirst(wxT('/')), false) ) { wxString strSubtype = wildcard.AfterFirst(wxT('/')); if ( strSubtype == wxT("*") || - strSubtype.IsSameAs(mimeType.AfterFirst(wxT('/')), FALSE) ) + strSubtype.IsSameAs(mimeType.AfterFirst(wxT('/')), false) ) { // matches (either exactly or it's a wildcard) - return TRUE; + return true; } } - return FALSE; + return false; } wxMimeTypesManager::wxMimeTypesManager() @@ -504,6 +516,7 @@ wxMimeTypesManager::Associate(const wxFileTypeInfo& ftInfo) #if defined(__WXMSW__) || defined(__UNIX__) return m_impl->Associate(ftInfo); #else // other platforms + wxUnusedVar(ftInfo); wxFAIL_MSG( _T("not implemented") ); // TODO return NULL; #endif // platforms @@ -603,8 +616,8 @@ void wxMimeTypesManager::Initialize(int mcapStyle, m_impl->Initialize(mcapStyle, sExtraDir); #else - (void)mcapStyle; - (void)sExtraDir; + (void)mcapStyle; + (void)sExtraDir; #endif // Unix } @@ -632,7 +645,7 @@ class wxMimeTypeCmnModule: public wxModule { public: wxMimeTypeCmnModule() : wxModule() { } - virtual bool OnInit() { return TRUE; } + virtual bool OnInit() { return true; } virtual void OnExit() { // this avoids false memory leak allerts: