added wxStaticCast, moved wxConstCast from wx/object.h to wx/defs.h for consistency

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

diff --git a/include/wx/mgl/icon.h b/include/wx/mgl/icon.h
index a555b7055237666b9fcaaab11205040d8001c2de..40ed949c92db55c3e235f454c6a484b9b99decc7 100644 (file)
--- a/include/wx/mgl/icon.h
+++ b/include/wx/mgl/icon.h
@@ -11,7 +11,7 @@
 #ifndef __WX_ICON_H__
 #define __WX_ICON_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "icon.h"
 #endif
 
@@ -44,7 +44,7 @@ public:
            wxBitmap(filename, (wxBitmapType)type) {}
 
     wxIcon(const wxIconLocation& loc)
-        : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ICO)
+        : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
     {
     }