X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bddd7a8d8953cf4c09e56c13e1bfcc594ba0267e..a9102b3671a45d116d781b0c8e90d2e9a84fbdcb:/include/wx/mimetype.h

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index f7cab60e83..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__
 
@@ -98,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
@@ -149,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.
@@ -177,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)
@@ -211,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;
 
@@ -231,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);
 
@@ -287,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
@@ -316,7 +319,7 @@ public:
         // get file type from MIME type (in format <category>/<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 ??
@@ -324,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);
 
@@ -340,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
@@ -384,8 +387,8 @@ private:
 // global variables
 // ----------------------------------------------------------------------------
 
-// the default mime manager for wxWindows programs
-WXDLLIMPEXP_DATA_BASE(extern wxMimeTypesManager *) wxTheMimeTypesManager;
+// the default mime manager for wxWidgets programs
+extern WXDLLIMPEXP_DATA_BASE(wxMimeTypesManager *) wxTheMimeTypesManager;
 
 #endif // wxUSE_MIMETYPE