Changed value of wxGA_SMOOTH (clashed with wxVERTICAL)

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

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index e71b6c3890edaa7fd99c48bb8cb257180f3f8217..70d3342c60044d1f9902fdfccca98ae86ab4f952 100644 (file)
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -32,7 +32,11 @@ class wxMimeTypesManagerImpl;
 // the accessors *must* be checked!
 class WXDLLEXPORT wxFileType
 {
 // the accessors *must* be checked!
 class WXDLLEXPORT wxFileType
 {

+#ifdef __MWERKS__
+friend class wxMimeTypesManagerImpl;  // it has access to m_impl
+#else

 friend wxMimeTypesManagerImpl;  // it has access to m_impl
 friend wxMimeTypesManagerImpl;  // it has access to m_impl

+#endif

 
 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


@@ -120,13 +124,25 @@ public:
                    // the other parameters form a NULL terminated list of
                    // extensions
                    ...);
                    // the other parameters form a NULL terminated list of
                    // extensions
                    ...);

-                   
+

         // invalid item - use this to terminate the array passed to
         // wxMimeTypesManager::AddFallbacks
     wxFileTypeInfo() { }
 
     bool IsValid() const { return !m_mimeType.IsEmpty(); }
 
         // invalid item - use this to terminate the array passed to
         // wxMimeTypesManager::AddFallbacks
     wxFileTypeInfo() { }
 
     bool IsValid() const { return !m_mimeType.IsEmpty(); }
 

+    // accessors
+        // get the MIME type
+    const wxString& GetMimeType() const { return m_mimeType; }
+        // get the open command
+    const wxString& GetOpenCommand() const { return m_openCmd; }
+        // get the print command
+    const wxString& GetPrintCommand() const { return m_printCmd; }
+        // get the description
+    const wxString& GetDescription() const { return m_desc; }
+        // get the array of all extensions
+    const wxArrayString& GetExtensions() const { return m_exts; }
+

 private:
     wxString m_mimeType,    // the MIME type in "type/subtype" form
              m_openCmd,     // command to use for opening the file (%s allowed)
 private:
     wxString m_mimeType,    // the MIME type in "type/subtype" form
              m_openCmd,     // command to use for opening the file (%s allowed)


@@ -187,7 +203,7 @@ public:
     // function.
     //
     // The filetypes array should be terminated by a NULL entry
     // function.
     //
     // The filetypes array should be terminated by a NULL entry

-    bool AddFallbacks(const wxFileTypeInfo *filetypes);
+    void AddFallbacks(const wxFileTypeInfo *filetypes);

 
     // dtor (not virtual, shouldn't be derived from)
     ~wxMimeTypesManager();
 
     // dtor (not virtual, shouldn't be derived from)
     ~wxMimeTypesManager();