Unicode compilation fixes

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

diff --git a/src/common/mimetype.cpp b/src/common/mimetype.cpp
index 38c39277112efbf91ba424698e0685055f742fea..3dab4f75fae31d8568db2add17e2d3b0b7cc1154 100644 (file)
--- a/src/common/mimetype.cpp
+++ b/src/common/mimetype.cpp
@@ -28,7 +28,9 @@
 
 #ifndef WX_PRECOMP
   #include "wx/string.h"
-  #include "wx/icon.h"
+  #if wxUSE_GUI
+    #include "wx/icon.h"
+  #endif
 #endif //WX_PRECOMP
 
 // Doesn't compile in WIN16 mode
@@ -43,7 +45,7 @@
 #ifdef __WXMSW__
     #include "wx/msw/registry.h"
     #include "windows.h"
-#elif defined(__UNIX__)
+#elif defined(__UNIX__)  || defined(__WXPM__)
     #include "wx/ffile.h"
     #include "wx/textfile.h"
     #include "wx/dir.h"
@@ -55,6 +57,9 @@
 // other standard headers
 #include <ctype.h>
 
+// in case we're compiling in non-GUI mode
+class WXDLLEXPORT wxIcon;
+
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -1339,7 +1344,7 @@ void wxGNOMEIconHandler::Init()
 {
     wxArrayString dirs;
     dirs.Add(_T("/usr/share"));
-    
+
     wxString gnomedir;
     wxGetHomeDir( &gnomedir );
     gnomedir += _T("/.gnome");