]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/unix/mimetype.h
Reverted conflict with Darwin.
[wxWidgets.git] / include / wx / unix / mimetype.h
index 3f03cf0483db648f69e626bd9b3d84aabe54c231..cc6f75f2d7869ecbdca5f06de0d75771d00308bb 100644 (file)
@@ -12,7 +12,7 @@
 #ifndef _MIMETYPE_IMPL_H
 #define _MIMETYPE_IMPL_H
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "mimetype.h"
 #endif
 
@@ -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)