X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..f6840be66eb772c08f0cbb43de677509d5d132bb:/include/wx/unix/mimetype.h diff --git a/include/wx/unix/mimetype.h b/include/wx/unix/mimetype.h index a15f76f881..cc6f75f2d7 100644 --- a/include/wx/unix/mimetype.h +++ b/include/wx/unix/mimetype.h @@ -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) @@ -177,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; }