added fix for MSL under Win32 (by Steve Hartwell)

[wxWidgets.git] / include / wx / gtk1 / icon.h

diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h
index 10bb5b12a27bcbd7690ec3a9599b7c9c1152b1e3..c784b646e4ee345ab9c7059e134743b929e57469 100644 (file)
--- a/include/wx/gtk1/icon.h
+++ b/include/wx/gtk1/icon.h
@@ -11,7 +11,7 @@
 #ifndef __GTKICONH__
 #define __GTKICONH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
@@ -46,7 +46,7 @@ public:
     wxIcon( char **bits, int width=-1, int height=-1 );
 
     wxIcon(const wxIconLocation& loc)
-        : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_XPM)
+        : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
     {
     }