Fix the warning about code sensitive to packing (VisualC).

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

diff --git a/include/wx/unix/mimetype.h b/include/wx/unix/mimetype.h
index 8d094010c6d78b8994081dcf0e6f0aa447d86c76..cc6f75f2d7869ecbdca5f06de0d75771d00308bb 100644 (file)
--- a/include/wx/unix/mimetype.h
+++ b/include/wx/unix/mimetype.h
@@ -6,13 +6,13 @@
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license (part of wxExtra library)
+// Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _MIMETYPE_IMPL_H
 #define _MIMETYPE_IMPL_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "mimetype.h"
 #endif
 
@@ -33,7 +33,7 @@ public:
     ~wxMimeTypesManagerImpl();
 
     // load all data into memory - done when it is needed for the first time
-    void Initialize(int mailcapStyles = wxMAILCAP_STANDARD,
+    void Initialize(int mailcapStyles = wxMAILCAP_ALL,
                     const wxString& extraDir = wxEmptyString);
 
     // and delete the data here
@@ -71,14 +71,7 @@ public:
     wxString GetExtension(size_t index) { return m_aExtensions[index]; }
 
 private:
-    void InitIfNeeded()
-    {
-        if ( !m_initialized ) {
-            // set the flag first to prevent recursion
-            m_initialized = TRUE;
-            Initialize();
-        }
-    }
+    void InitIfNeeded();
 
     wxArrayString m_aTypes,         // MIME types
                   m_aDescriptions,  // descriptions (just some text)
@@ -98,9 +91,11 @@ private:
     wxString GetCommand(const wxString &verb, size_t nIndex) const;
 
     // read Gnome files
-    void LoadGnomeDataFromKeyFile(const wxString& filename);
+    void LoadGnomeDataFromKeyFile(const wxString& filename,
+                                  const wxArrayString& dirs);
     void LoadGnomeMimeTypesFromMimeFile(const wxString& filename);
-    void LoadGnomeMimeFilesFromDir(const wxString& dirbase);
+    void LoadGnomeMimeFilesFromDir(const wxString& dirbase,
+                                   const wxArrayString& dirs);
     void GetGnomeMimeInfo(const wxString& sExtraDir);
 
     // write gnome files
@@ -175,8 +170,7 @@ public:
     bool GetMimeType(wxString *mimeType) const
         { *mimeType = m_manager->m_aTypes[m_index[0]]; return TRUE; }
     bool GetMimeTypes(wxArrayString& mimeTypes) const;
-    bool GetIcon(wxIcon *icon, wxString *iconFile = NULL,
-                 int *iconIndex = NULL) const;
+    bool GetIcon(wxIconLocation *iconLoc) const;
 
     bool GetDescription(wxString *desc) const
         { *desc = m_manager->m_aDescriptions[m_index[0]]; return TRUE; }