fixed suppressing of wxFontMapper questions which was broken by GUI/base separation...

[wxWidgets.git] / src / os2 / mimetype.cpp

diff --git a/src/os2/mimetype.cpp b/src/os2/mimetype.cpp
index bee950fe6d2ac3caa39dc2997f68ed69feb91929..215229c4a34dff75467a8cfb22116d28db9a3650 100644 (file)
--- a/src/os2/mimetype.cpp
+++ b/src/os2/mimetype.cpp
@@ -6,7 +6,7 @@
 // Created:     01.21.00
 // RCS-ID:      $Id$
 // Copyright:   Adopted from msw port --(c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     01.21.00
 // RCS-ID:      $Id$
 // Copyright:   Adopted from msw port --(c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license (part of wxExtra library)
+// Licence:     wxWindows licence (part of wxExtra library)

 /////////////////////////////////////////////////////////////////////////////
 
 #define INCL_DOS
 /////////////////////////////////////////////////////////////////////////////
 
 #define INCL_DOS


@@ -27,6 +27,8 @@
 #include "wx/dynarray.h"
 #include "wx/confbase.h"
 
 #include "wx/dynarray.h"
 #include "wx/confbase.h"
 

+#if wxUSE_FILE
+

 #include "wx/os2/mimetype.h"
 
 // other standard headers
 #include "wx/os2/mimetype.h"
 
 // other standard headers


@@ -229,7 +231,21 @@ bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const
   return FALSE;
 }
 
   return FALSE;
 }
 

-bool wxFileTypeImpl::GetIcon(wxIcon *icon) const
+bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
+{
+    wxString s;
+
+    if (GetMimeType(&s))
+    {
+        mimeTypes.Clear();
+        mimeTypes.Add(s);
+        return TRUE;
+    }
+    else
+        return FALSE;
+}
+
+bool wxFileTypeImpl::GetIcon(wxIcon *icon, wxString* psCommand, int* pnIndex) const

 {
 #if wxUSE_GUI
     if ( m_info ) {
 {
 #if wxUSE_GUI
     if ( m_info ) {


@@ -318,7 +334,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext)
 {
     // add the leading point if necessary
     wxString str;
 {
     // add the leading point if necessary
     wxString str;

-    if ( ext[0u] != wxT('.') ) {
+    if ( ext[(size_t) 0] != wxT('.') ) {

         str = wxT('.');
     }
     str << ext;
         str = wxT('.');
     }
     str << ext;


@@ -436,3 +452,4 @@ size_t wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString& mimetypes)
   return 0;
 }
 
   return 0;
 }
 

+#endif //wxUSE_FILE