merged in fix for GetValue() from the 2.2 branch

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

diff --git a/include/wx/unix/mimetype.h b/include/wx/unix/mimetype.h
index 2677c1ffe7f34170a3f65a8c5ae07ea4b9fbdc93..3b7f478fd4fd525c4c891b2bd3f46bbff8c302bd 100644 (file)
--- a/include/wx/unix/mimetype.h
+++ b/include/wx/unix/mimetype.h
@@ -36,6 +36,8 @@ public:
     // ctor loads all info into memory for quicker access later on
     // TODO it would be nice to load them all, but parse on demand only...
     wxMimeTypesManagerImpl();
+    ~wxMimeTypesManagerImpl();
+    
 
     // implement containing class functions
     wxFileType *GetFileTypeFromExtension(const wxString& ext);
@@ -76,20 +78,23 @@ private:
     static ArrayIconHandlers ms_iconHandlers;
 };
 
+
+
 class WXDLLEXPORT wxFileTypeImpl
 {
 public:
     // initialization functions
     void Init(wxMimeTypesManagerImpl *manager, size_t index)
-        { m_manager = manager; m_index = index; }
+        { m_manager = manager; m_index.Add(index); }
 
     // accessors
     bool GetExtensions(wxArrayString& extensions);
     bool GetMimeType(wxString *mimeType) const
-        { *mimeType = m_manager->m_aTypes[m_index]; return TRUE; }
+        { *mimeType = m_manager->m_aTypes[m_index[0]]; return TRUE; }
+    bool GetMimeTypes(wxArrayString& mimeTypes) const;
     bool GetIcon(wxIcon *icon) const;
     bool GetDescription(wxString *desc) const
-        { *desc = m_manager->m_aDescriptions[m_index]; return TRUE; }
+        { *desc = m_manager->m_aDescriptions[m_index[0]]; return TRUE; }
 
     bool GetOpenCommand(wxString *openCmd,
                         const wxFileType::MessageParameters& params) const
@@ -113,7 +118,7 @@ private:
                             bool open) const;
 
     wxMimeTypesManagerImpl *m_manager;
-    size_t                  m_index; // in the wxMimeTypesManagerImpl arrays
+    wxArrayInt              m_index; // in the wxMimeTypesManagerImpl arrays
 };