Last correction for makefile.g95: win32 mkdir does not like forward slashes as directory

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

diff --git a/src/os2/mimetype.cpp b/src/os2/mimetype.cpp
index bee950fe6d2ac3caa39dc2997f68ed69feb91929..cd51d499dc41e9a07ede4596e5b941ddbdf8306f 100644 (file)
--- a/src/os2/mimetype.cpp
+++ b/src/os2/mimetype.cpp
@@ -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,6 +231,20 @@ bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const
   return FALSE;
 }
 
   return FALSE;
 }
 

+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) const
 {
 #if wxUSE_GUI
 bool wxFileTypeImpl::GetIcon(wxIcon *icon) const
 {
 #if wxUSE_GUI


@@ -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