Cured memory leak report in wxDateTime; wxGLCanvas corrections

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

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index e71b6c3890edaa7fd99c48bb8cb257180f3f8217..58a6bf7e2d70d21171bfc22e944fecb0b691413f 100644 (file)
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -12,6 +12,11 @@
 #ifndef _MIMETYPE_H
 #define _MIMETYPE_H
 
 #ifndef _MIMETYPE_H
 #define _MIMETYPE_H
 

+#ifdef __GNUG__
+#pragma interface "mimetypebase.h"
+#endif
+
+

 // fwd decls
 class wxIcon;
 class wxFileTypeImpl;
 // fwd decls
 class wxIcon;
 class wxFileTypeImpl;


@@ -23,6 +28,7 @@ class wxMimeTypesManagerImpl;
 
 // the things we really need
 #include "wx/string.h"
 
 // the things we really need
 #include "wx/string.h"

+#include "wx/dynarray.h"

 
 // This class holds information about a given "file type". File type is the
 // same as MIME type under Unix, but under Windows it corresponds more to an
 
 // This class holds information about a given "file type". File type is the
 // same as MIME type under Unix, but under Windows it corresponds more to an


@@ -32,7 +38,7 @@ class wxMimeTypesManagerImpl;
 // the accessors *must* be checked!
 class WXDLLEXPORT wxFileType
 {
 // the accessors *must* be checked!
 class WXDLLEXPORT wxFileType
 {

-friend wxMimeTypesManagerImpl;  // it has access to m_impl
+friend class WXDLLEXPORT 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


@@ -69,6 +75,7 @@ public:
     // parameters are unchanged)
         // return the MIME type for this file type
     bool GetMimeType(wxString *mimeType) const;
     // parameters are unchanged)
         // return the MIME type for this file type
     bool GetMimeType(wxString *mimeType) const;

+    bool GetMimeTypes(wxArrayString& mimeTypes) const;

         // 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);


@@ -120,13 +127,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)


@@ -136,6 +155,9 @@ private:
     wxArrayString m_exts;   // the extensions which are mapped on this filetype
 };
 
     wxArrayString m_exts;   // the extensions which are mapped on this filetype
 };
 

+WX_DECLARE_EXPORTED_OBJARRAY(wxFileTypeInfo, wxArrayFileTypeInfo);
+
+

 // This class accesses the information about all known MIME types and allows
 // the application to retrieve information (including how to handle data of
 // given type) about them.
 // This class accesses the information about all known MIME types and allows
 // the application to retrieve information (including how to handle data of
 // given type) about them.


@@ -178,6 +200,11 @@ public:
         // 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);
 

+    // enumerate all known MIME types
+    //
+    // returns the number of retrieved file types
+    size_t EnumAllFileTypes(wxArrayString& mimetypes);
+

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


@@ -187,7 +214,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();


@@ -198,8 +225,19 @@ private:
     wxMimeTypesManager& operator=(const wxMimeTypesManager&);
 
     wxMimeTypesManagerImpl *m_impl;
     wxMimeTypesManager& operator=(const wxMimeTypesManager&);
 
     wxMimeTypesManagerImpl *m_impl;

+    
+    // if m_impl is NULL, create one
+    void EnsureImpl();

 };
 
 };
 

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

 #endif
   // wxUSE_FILE
 
 #endif
   // wxUSE_FILE