disable use of #pragma interface under Mac OS X

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

diff --git a/include/wx/mac/icon.h b/include/wx/mac/icon.h
index 512e95e88f259d8fbbf09fda6699d4dae41dc69b..c95b89aee22a2da5de8e4d7f82f5180b4df78b61 100644 (file)
--- a/include/wx/mac/icon.h
+++ b/include/wx/mac/icon.h
@@ -12,7 +12,7 @@
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "icon.h"
 #endif
 
@@ -27,18 +27,20 @@ public:
   wxIcon();
 
   // Copy constructors
-  inline wxIcon(const wxIcon& icon) { Ref(icon); }
+  wxIcon(const wxIcon& icon)
+      : wxBitmap()
+      { Ref(icon); }
 
   wxIcon(const char **data);
   wxIcon(char **data);
-  wxIcon(const char bits[], int width=-1, int height=-1);
-  wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICON_RESOURCE,
+  wxIcon(const char bits[], int width , int height );
+  wxIcon(const wxString& name, int flags = wxBITMAP_TYPE_ICON_RESOURCE,
     int desiredWidth = -1, int desiredHeight = -1);
   ~wxIcon();
 
-  bool LoadFile(const wxString& name, long flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ ,
+  bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ ,
       int desiredWidth /* = -1 */ , int desiredHeight = -1);
-  bool LoadFile(const wxString& name ,long flags = wxBITMAP_TYPE_ICON_RESOURCE )
+  bool LoadFile(const wxString& name ,wxBitmapType flags = wxBITMAP_TYPE_ICON_RESOURCE )
        { return LoadFile( name , flags , -1 , -1 ) ; } 
 
   inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }