X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0e2aaa94a6f780fd6d63b8b1e420259fda6689f..7722d490f224d8f292f27fd90b1f42a00e20da8b:/include/wx/mimetype.h diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h index 973162160c..b398d8c974 100644 --- a/include/wx/mimetype.h +++ b/include/wx/mimetype.h @@ -13,7 +13,7 @@ #ifndef _WX_MIMETYPE_H_ #define _WX_MIMETYPE_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "mimetypebase.h" #endif // __GNUG__ @@ -30,14 +30,9 @@ #include "wx/dynarray.h" // fwd decls -#if defined(__WXMSW__) -class WXDLLEXPORT wxIconLocation; -#else -class WXDLLEXPORT wxIconLocationBase; -typedef wxIconLocationBase wxIconLocation; -#endif //defined(__WXMSW__) -class WXDLLEXPORT wxFileTypeImpl; -class WXDLLEXPORT wxMimeTypesManagerImpl; +class WXDLLIMPEXP_BASE wxIconLocation; +class WXDLLIMPEXP_BASE wxFileTypeImpl; +class WXDLLIMPEXP_BASE wxMimeTypesManagerImpl; // these constants define the MIME informations source under UNIX and are used // by wxMimeTypesManager::Initialize() @@ -54,7 +49,7 @@ enum wxMailcapStyle /* TODO: would it be more convenient to have this class? -class WXDLLEXPORT wxMimeType : public wxString +class WXDLLIMPEXP_BASE wxMimeType : public wxString { public: // all string ctors here @@ -81,7 +76,7 @@ public: // This class is used with wxMimeTypesManager::AddFallbacks() and Associate() // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFileTypeInfo +class WXDLLIMPEXP_BASE wxFileTypeInfo { public: // ctors @@ -103,7 +98,7 @@ public: wxFileTypeInfo() { } // test if this object can be used - bool IsValid() const { return !m_mimeType.IsEmpty(); } + bool IsValid() const { return !m_mimeType.empty(); } // setters // set the icon info @@ -154,7 +149,8 @@ private: #endif // 0 }; -WX_DECLARE_EXPORTED_OBJARRAY(wxFileTypeInfo, wxArrayFileTypeInfo); +WX_DECLARE_USER_EXPORTED_OBJARRAY(wxFileTypeInfo, wxArrayFileTypeInfo, + WXDLLIMPEXP_BASE); // ---------------------------------------------------------------------------- // wxFileType: gives access to all information about the files of given type. @@ -167,9 +163,9 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxFileTypeInfo, wxArrayFileTypeInfo); // the accessors *must* be checked! // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFileType +class WXDLLIMPEXP_BASE wxFileType { -friend class WXDLLEXPORT wxMimeTypesManagerImpl; // it has access to m_impl +friend class WXDLLIMPEXP_BASE wxMimeTypesManagerImpl; // it has access to m_impl public: // An object of this class must be passed to Get{Open|Print}Command. The @@ -182,7 +178,7 @@ public: // ctors MessageParameters() { } MessageParameters(const wxString& filename, - const wxString& mimetype = _T("")) + const wxString& mimetype = wxEmptyString) : m_filename(filename), m_mimetype(mimetype) { } // accessors (called by GetOpenCommand) @@ -216,6 +212,8 @@ public: bool GetExtensions(wxArrayString& extensions); // get the icon corresponding to this file type and of the given size bool GetIcon(wxIconLocation *iconloc) const; + bool GetIcon(wxIconLocation *iconloc, + const MessageParameters& params) const; // get a brief file type description ("*.txt" => "text document") bool GetDescription(wxString *desc) const; @@ -236,9 +234,9 @@ public: const wxFileType::MessageParameters& params) const; // 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); @@ -283,7 +281,7 @@ private: // given type) about them. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMimeTypesManager +class WXDLLIMPEXP_BASE wxMimeTypesManager { public: // static helper functions @@ -292,7 +290,7 @@ public: // check if the given MIME type is the same as the other one: the // second argument may contain wildcards ('*'), but not the first. If // the types are equal or if the mimeType matches wildcard the function - // returns TRUE, otherwise it returns FALSE + // returns true, otherwise it returns false static bool IsOfType(const wxString& mimeType, const wxString& wildcard); // ctor @@ -321,7 +319,7 @@ public: // get file type from MIME type (in format /) wxFileType *GetFileTypeFromMimeType(const wxString& mimeType); - // other operations: return TRUE if there were no errors or FALSE if there + // other operations: return true if there were no errors or false if there // were some unreckognized entries (the good entries are always read anyhow) // // FIXME: These ought to be private ?? @@ -329,12 +327,12 @@ public: // read in additional file (the standard ones are read automatically) // in mailcap format (see mimetype.cpp for description) // - // 'fallback' parameter may be set to TRUE to avoid overriding the + // 'fallback' parameter may be set to true to avoid overriding the // settings from other, previously parsed, files by this one: normally, // the files read most recently would override the older files, but with - // fallback == TRUE this won't happen + // fallback == true this won't happen - bool ReadMailcap(const wxString& filename, bool fallback = FALSE); + bool ReadMailcap(const wxString& filename, bool fallback = false); // read in additional file in mime.types format bool ReadMimeTypes(const wxString& filename); @@ -345,7 +343,7 @@ public: // these functions can be used to provide default values for some of the // MIME types inside the program itself (you may also use - // ReadMailcap(filenameWithDefaultTypes, TRUE /* use as fallback */) to + // ReadMailcap(filenameWithDefaultTypes, true /* use as fallback */) to // achieve the same goal, but this requires having this info in a file). // // The filetypes array should be terminated by either NULL entry or an @@ -389,8 +387,8 @@ private: // global variables // ---------------------------------------------------------------------------- -// the default mime manager for wxWindows programs -WXDLLEXPORT_DATA(extern wxMimeTypesManager *) wxTheMimeTypesManager; +// the default mime manager for wxWidgets programs +extern WXDLLIMPEXP_DATA_BASE(wxMimeTypesManager *) wxTheMimeTypesManager; #endif // wxUSE_MIMETYPE