added operator[] for STL builds

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

diff --git a/include/wx/x11/icon.h b/include/wx/x11/icon.h
index 95ec79f429fc35f804d20fbcae2fc3d538289a92..50272abd0330b9e618c3da078775cc370c4e50d1 100644 (file)
--- a/include/wx/x11/icon.h
+++ b/include/wx/x11/icon.h
@@ -12,21 +12,16 @@
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "icon.h"
-#endif
-
 #include "wx/bitmap.h"
 
 //-----------------------------------------------------------------------------
 // wxIcon
 //-----------------------------------------------------------------------------
 
-class wxIcon: public wxBitmap
+class WXDLLIMPEXP_CORE wxIcon: public wxBitmap
 {
 public:
     wxIcon();
-    wxIcon( const wxIcon& icon);
     wxIcon( const char **bits, int width=-1, int height=-1 );
 
     // For compatibility with wxMSW where desired size is sometimes required to
@@ -39,11 +34,10 @@ 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)
     {
     }
 
-    wxIcon& operator=(const wxIcon& icon);
     bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; }
     bool operator!=(const wxIcon& icon) const { return !(*this == icon); }