added an error message if a bitmap can't be addedto the image list

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

diff --git a/src/common/mimetype.cpp b/src/common/mimetype.cpp
index 61310e14de9ba04448904e0439713a1abe81a00e..91941453210b9943c2efcc53c1699082736ffe8f 100644 (file)
--- a/src/common/mimetype.cpp
+++ b/src/common/mimetype.cpp
@@ -31,14 +31,20 @@
 // wxWindows
 #ifndef WX_PRECOMP
     #include  "wx/string.h"
+    #include  "wx/icon.h"
 #endif //WX_PRECOMP
 
+// Doesn't compile in WIN16 mode
+#ifndef __WIN16__
+
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/dynarray.h"
+#include "wx/confbase.h"
 
 #ifdef __WXMSW__
     #include "wx/msw/registry.h"
+    #include "windows.h"
 #else  // Unix
     #include "wx/textfile.h"
 #endif // OS
@@ -1207,5 +1213,5 @@ void wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName)
 
 #endif // OS type
 
-/* vi: set cin tw=80 ts=4 sw=4: */
-
+#endif
+  // __WIN16__