Added missing AddBook

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

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index 0f5b78819b419e76404007ff63928be2a54035c2..241bdb34f9bc289b26caf123ed1fa41779c82fd8 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_
 

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

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


@@ -23,6 +23,8 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

+#if wxUSE_MIMETYPE
+

 // the things we really need
 #include "wx/string.h"
 #include "wx/dynarray.h"
 // the things we really need
 #include "wx/string.h"
 #include "wx/dynarray.h"


@@ -79,10 +81,10 @@ class WXDLLEXPORT 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
                    ...);


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

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

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


@@ -219,6 +222,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;


@@ -385,5 +391,7 @@ private:
 // the default mime manager for wxWindows programs
 WXDLLEXPORT_DATA(extern wxMimeTypesManager *) wxTheMimeTypesManager;
 
 // the default mime manager for wxWindows programs
 WXDLLEXPORT_DATA(extern wxMimeTypesManager *) wxTheMimeTypesManager;
 

+#endif // wxUSE_MIMETYPE
+

 #endif
   //_WX_MIMETYPE_H_
 #endif
   //_WX_MIMETYPE_H_