Applied patch [ 832096 ] Final separation for GUI and console for Open Watcom

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

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index 9494e1ad1683e18e8051544ffb22c189eeb2b0bd..5aa2438f8c4942fbd67cbee75baebd52a4baf6f9 100644 (file)
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -13,7 +13,7 @@
 #ifndef _WX_MIMETYPE_H_
 #define _WX_MIMETYPE_H_
 
 #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__
 
     #pragma interface "mimetypebase.h"
 #endif // __GNUG__
 


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

-class WXDLLEXPORT wxIconLocation;
-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,7 +76,7 @@ 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
 {
 public:
     // ctors


@@ -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


@@ -177,7 +178,7 @@ public:
         // ctors
         MessageParameters() { }
         MessageParameters(const wxString& filename,
         // ctors
         MessageParameters() { }
         MessageParameters(const wxString& filename,

-                          const wxString& mimetype = _T(""))
+                          const wxString& mimetype = wxEmptyString)

             : m_filename(filename), m_mimetype(mimetype) { }
 
         // accessors (called by GetOpenCommand)
             : 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 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;
 
         // get a brief file type description ("*.txt" => "text document")
     bool GetDescription(wxString *desc) const;
 


@@ -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


@@ -385,7 +388,7 @@ private:
 // ----------------------------------------------------------------------------
 
 // the default mime manager for wxWindows programs
 // ----------------------------------------------------------------------------
 
 // the default mime manager for wxWindows programs

-WXDLLEXPORT_DATA(extern wxMimeTypesManager *) wxTheMimeTypesManager;
+WXDLLIMPEXP_DATA_BASE(extern wxMimeTypesManager *) wxTheMimeTypesManager;

 
 #endif // wxUSE_MIMETYPE
 
 
 #endif // wxUSE_MIMETYPE