X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33ac7e6f01acbac1cff0ad400d8ea7f0bfd0a62f..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/msw/mimetype.h diff --git a/include/wx/msw/mimetype.h b/include/wx/msw/mimetype.h index 7de0730b2f..f93b67c5bf 100644 --- a/include/wx/msw/mimetype.h +++ b/include/wx/msw/mimetype.h @@ -6,18 +6,16 @@ // Created: 23.09.98 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license (part of wxExtra library) +// Licence: wxWindows licence (part of wxExtra library) ///////////////////////////////////////////////////////////////////////////// #ifndef _MIMETYPE_IMPL_H #define _MIMETYPE_IMPL_H -#ifdef __GNUG__ - #pragma interface "mimetype.h" -#endif - #include "wx/defs.h" +#if wxUSE_MIMETYPE + #include "wx/mimetype.h" // ---------------------------------------------------------------------------- @@ -25,7 +23,7 @@ // and is never used directly by the application // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFileTypeImpl +class WXDLLIMPEXP_BASE wxFileTypeImpl { public: // ctor @@ -42,7 +40,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; @@ -55,10 +53,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); @@ -68,13 +66,13 @@ public: private: // helper function: reads the command corresponding to the specified verb // from the registry (returns an empty string if not found) - wxString GetCommand(const wxChar *verb) const; + wxString GetCommand(const wxString& verb) const; // get the registry path for the given verb wxString GetVerbPath(const wxString& verb) const; // check that the registry key for our extension exists, create it if it - // doesn't, return FALSE if this failed + // doesn't, return false if this failed bool EnsureExtKeyExists(); wxString m_strFileType, // may be empty @@ -90,7 +88,7 @@ private: bool RemoveDescription(); }; -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 @@ -104,12 +102,6 @@ public: size_t EnumAllFileTypes(wxArrayString& mimetypes); - // this are NOPs under Windows - bool ReadMailcap(const wxString& WXUNUSED(filename), bool WXUNUSED(fallback) = TRUE) - { return TRUE; } - bool ReadMimeTypes(const wxString& WXUNUSED(filename)) - { return TRUE; } - // create a new filetype association wxFileType *Associate(const wxFileTypeInfo& ftInfo); @@ -117,6 +109,7 @@ public: wxFileType *CreateFileType(const wxString& filetype, const wxString& ext); }; +#endif // wxUSE_MIMETYPE #endif //_MIMETYPE_IMPL_H