Make InheritAttributes and ShouldInheritColours public so they can be

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

diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index 1f2fab60b99e669e0ef34bb4c55c20fab01f8a31..eba9735f4d6a570713b6b63fdaf45e40681b7faa 100644 (file)
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -12,7 +12,7 @@
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "icon.h"
 #endif
 
@@ -42,7 +42,7 @@ public:
 
     wxIcon(const wxIconLocation& loc)
     {
-        LoadFile(loc.GetFileName());
+        LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ANY);
     }
 
     ~wxIcon();