X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/os2/mimetype.h diff --git a/include/wx/os2/mimetype.h b/include/wx/os2/mimetype.h index ac2f55bc55..75000e99f6 100644 --- a/include/wx/os2/mimetype.h +++ b/include/wx/os2/mimetype.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mimetype.h +// Name: wx/os2/mimetype.h // Purpose: classes and functions to manage MIME types // Author: David Webster // Modified by: @@ -14,10 +14,16 @@ #include "wx/defs.h" +#if wxUSE_MIMETYPE + #include "wx/mimetype.h" +// ---------------------------------------------------------------------------- +// wxFileTypeImpl is the OS/2 version of wxFileType, this is a private class +// and is never used directly by the application +// ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFileTypeImpl +class WXDLLIMPEXP_BASE wxFileTypeImpl { public: // ctor @@ -40,7 +46,7 @@ public: bool GetExtensions(wxArrayString& extensions); bool GetMimeType(wxString *mimeType) const; bool GetMimeTypes(wxArrayString& mimeTypes) const; - bool GetIcon(wxIcon *icon, wxString *sCommand = NULL, int *iIndex = NULL) const; + bool GetIcon(wxIconLocation *iconLoc) const; bool GetDescription(wxString *desc) const; bool GetOpenCommand(wxString *openCmd, const wxFileType::MessageParameters& params) const; @@ -53,10 +59,10 @@ public: bool Unassociate(); // set an arbitrary command, ask confirmation if it already exists and - // overwriteprompt is TRUE + // overwriteprompt is true bool SetCommand(const wxString& cmd, const wxString& verb, - bool overwriteprompt = TRUE); + bool overwriteprompt = true); bool SetDefaultIcon(const wxString& cmd = wxEmptyString, int index = 0); @@ -76,7 +82,7 @@ private: -class WXDLLEXPORT wxMimeTypesManagerImpl +class WXDLLIMPEXP_BASE wxMimeTypesManagerImpl { public: // nothing to do here, we don't load any data but just go and fetch it from @@ -90,11 +96,11 @@ public: size_t EnumAllFileTypes(wxArrayString& mimetypes); - // these are NOPs under Windows - bool ReadMailcap(const wxString& filename, bool fallback = TRUE) - { return TRUE; } - bool ReadMimeTypes(const wxString& filename) - { return TRUE; } + // these are NOPs under OS/2 + bool ReadMailcap(const wxString& WXUNUSED(filename), bool WXUNUSED(fallback) = true) + { return true; } + bool ReadMimeTypes(const wxString& WXUNUSED(filename)) + { return true; } void AddFallback(const wxFileTypeInfo& ft) { m_fallbacks.Add(ft); } @@ -102,7 +108,7 @@ private: wxArrayFileTypeInfo m_fallbacks; }; +#endif // wxUSE_MIMETYPE #endif //_MIMETYPE_IMPL_H -