refactored code to do brush adjustment for bg drawing in only one place

[wxWidgets.git] / include / wx / mimetype.h

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index 2b7219d771b81ebd3e7aa142bfdeb88774170891..ced6b00150364651f2902f111bd1801e22db99c1 100644 (file)
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -7,13 +7,13 @@
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license (part of wxExtra library)
+// Licence:     wxWindows licence (part of wxExtra library)

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MIMETYPE_H_
 #define _WX_MIMETYPE_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MIMETYPE_H_
 #define _WX_MIMETYPE_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "mimetypebase.h"
 #endif // __GNUG__
 
     #pragma interface "mimetypebase.h"
 #endif // __GNUG__
 


@@ -30,9 +30,9 @@
 #include "wx/dynarray.h"
 
 // fwd decls
 #include "wx/dynarray.h"
 
 // fwd decls

-class WXDLLEXPORT wxIcon;
-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()
 
 // these constants define the MIME informations source under UNIX and are used
 // by wxMimeTypesManager::Initialize()


@@ -49,7 +49,7 @@ enum wxMailcapStyle
 /*
     TODO: would it be more convenient to have this class?
 
 /*
     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
 {
 public:
     // all string ctors here


@@ -76,15 +76,15 @@ public:
 // This class is used with wxMimeTypesManager::AddFallbacks() and Associate()
 // ----------------------------------------------------------------------------
 
 // This class is used with wxMimeTypesManager::AddFallbacks() and Associate()
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFileTypeInfo
+class WXDLLIMPEXP_BASE wxFileTypeInfo

 {
 public:
     // ctors
         // a normal item
 {
 public:
     // ctors
         // a normal item

-    wxFileTypeInfo(const char *mimeType,
-                   const char *openCmd,
-                   const char *printCmd,
-                   const char *desc,
+    wxFileTypeInfo(const wxChar *mimeType,
+                   const wxChar *openCmd,
+                   const wxChar *printCmd,
+                   const wxChar *desc,

                    // the other parameters form a NULL terminated list of
                    // extensions
                    ...);
                    // the other parameters form a NULL terminated list of
                    // extensions
                    ...);


@@ -149,7 +149,8 @@ private:
 #endif // 0
 };
 
 #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.
 
 // ----------------------------------------------------------------------------
 // wxFileType: gives access to all information about the files of given type.


@@ -162,9 +163,9 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxFileTypeInfo, wxArrayFileTypeInfo);
 // the accessors *must* be checked!
 // ----------------------------------------------------------------------------
 
 // 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
 
 public:
     // An object of this class must be passed to Get{Open|Print}Command. The


@@ -176,7 +177,8 @@ public:
     public:
         // ctors
         MessageParameters() { }
     public:
         // ctors
         MessageParameters() { }

-        MessageParameters(const wxString& filename, const wxString& mimetype)
+        MessageParameters(const wxString& filename,
+                          const wxString& mimetype = wxEmptyString)

             : m_filename(filename), m_mimetype(mimetype) { }
 
         // accessors (called by GetOpenCommand)
             : m_filename(filename), m_mimetype(mimetype) { }
 
         // accessors (called by GetOpenCommand)


@@ -208,12 +210,10 @@ public:
         // fill passed in array with all extensions associated with this file
         // type
     bool GetExtensions(wxArrayString& extensions);
         // fill passed in array with all extensions associated with this file
         // type
     bool GetExtensions(wxArrayString& extensions);

-        // get the icon corresponding to this file type, the name of the file
-        // where the icon resides is return in iconfile if !NULL and its index
-        // in this file (Win-only) is in iconIndex
-    bool GetIcon(wxIcon *icon,
-                 wxString *iconFile = NULL,
-                 int *iconIndex = NULL) const;
+        // 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;
 
         // get a brief file type description ("*.txt" => "text document")
     bool GetDescription(wxString *desc) const;
 


@@ -221,6 +221,9 @@ public:
         // get the command to execute the file of given type
     bool GetOpenCommand(wxString *openCmd,
                         const MessageParameters& params) const;
         // get the command to execute the file of given type
     bool GetOpenCommand(wxString *openCmd,
                         const MessageParameters& params) const;

+        // a simpler to use version of GetOpenCommand() -- it only takes the
+        // filename and returns an empty string on failure
+    wxString GetOpenCommand(const wxString& filename) const;

         // get the command to print the file of given type
     bool GetPrintCommand(wxString *printCmd,
                          const MessageParameters& params) const;
         // get the command to print the file of given type
     bool GetPrintCommand(wxString *printCmd,
                          const MessageParameters& params) const;


@@ -231,9 +234,9 @@ public:
                           const wxFileType::MessageParameters& params) const;
 
     // set an arbitrary command, ask confirmation if it already exists and
                           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 SetCommand(const wxString& cmd, const wxString& verb,

-        bool overwriteprompt = TRUE);
+        bool overwriteprompt = true);

 
     bool SetDefaultIcon(const wxString& cmd = wxEmptyString, int index = 0);
 
 
     bool SetDefaultIcon(const wxString& cmd = wxEmptyString, int index = 0);
 


@@ -278,7 +281,7 @@ private:
 // given type) about them.
 // ----------------------------------------------------------------------------
 
 // given type) about them.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMimeTypesManager
+class WXDLLIMPEXP_BASE wxMimeTypesManager

 {
 public:
     // static helper functions
 {
 public:
     // static helper functions


@@ -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
         // 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
     static bool IsOfType(const wxString& mimeType, const wxString& wildcard);
 
     // ctor


@@ -301,7 +304,7 @@ public:
     //
     // use the extraDir parameter if you want to look for files in another
     // directory
     //
     // use the extraDir parameter if you want to look for files in another
     // directory

-    void Initialize(int mailcapStyle = wxMAILCAP_STANDARD,
+    void Initialize(int mailcapStyle = wxMAILCAP_ALL,

                     const wxString& extraDir = wxEmptyString);
 
     // and this function clears all the data from the manager
                     const wxString& extraDir = wxEmptyString);
 
     // and this function clears all the data from the manager


@@ -316,7 +319,7 @@ public:
         // get file type from MIME type (in format <category>/<format>)
     wxFileType *GetFileTypeFromMimeType(const wxString& mimeType);
 
         // 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 ??
     // 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)
         //
         // 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
         // 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);
 
         // 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
 
     // 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
     // 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
 // ----------------------------------------------------------------------------
 
 // global variables
 // ----------------------------------------------------------------------------
 

-// the default mime manager for wxWindows programs
-WXDLLEXPORT_DATA(extern wxMimeTypesManager *) wxTheMimeTypesManager;
+// the default mime manager for wxWidgets programs
+WXDLLIMPEXP_DATA_BASE(extern wxMimeTypesManager *) wxTheMimeTypesManager;

 
 #endif // wxUSE_MIMETYPE
 
 
 #endif // wxUSE_MIMETYPE