General tidy-up (mainly typecasts) to allow the use of the SGI native

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

diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h
index 2d9ee3752277c83be0feb14c6632486158535599..7596879cd9de1c27ce8e7513b148276b31b240d5 100644 (file)
--- a/include/wx/gtk/icon.h
+++ b/include/wx/gtk/icon.h
@@ -36,16 +36,12 @@ class wxIcon: public wxBitmap
 
 public:
 
 
 public:
 

-  wxIcon(void) {};
-
-  inline wxIcon(const wxIcon& icon) { Ref(icon); }
-  inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); }
-  
-  // Don't change this. Robert.
-  wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
-    wxBitmap( bits ) {};
-    
-  inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
+  wxIcon(void);
+  wxIcon(const wxIcon& icon);
+  wxIcon(const wxIcon* icon);
+  wxIcon( char **bits, int width=-1, int height=-1 );
+
+  wxIcon& operator = (const wxIcon& icon);

   inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
   inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
 };
   inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
   inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
 };