X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e52f60e65236befe1a509cc3c1823607be0d2b3c..1ae82ba9f23ee688bc4db2cd449eca5bf97cfdf0:/src/gtk1/icon.cpp?ds=sidebyside

diff --git a/src/gtk1/icon.cpp b/src/gtk1/icon.cpp
index 37ce52b757..0d82d6830b 100644
--- a/src/gtk1/icon.cpp
+++ b/src/gtk1/icon.cpp
@@ -7,9 +7,8 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "icon.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #include "wx/icon.h"
 
@@ -19,34 +18,22 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon,wxBitmap)
 
-wxIcon::wxIcon( const char **bits, int WXUNUSED(width), int WXUNUSED(height) ) : 
-    wxBitmap( bits ) 
+wxIcon::wxIcon( const char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
+    wxBitmap( bits )
 {
 }
-    
-wxIcon::wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) : 
-    wxBitmap( bits ) 
-{
-}
-    
-wxIcon::wxIcon() :  wxBitmap() 
-{  
-}
 
-wxIcon::wxIcon( const wxIcon& icon ) : wxBitmap()
-{ 
-    Ref(icon); 
+wxIcon::wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
+    wxBitmap( bits )
+{
 }
 
-wxIcon::wxIcon( const wxIcon* icon ) : wxBitmap()
-{ 
-    if (icon) Ref(*icon); 
+wxIcon::wxIcon() :  wxBitmap()
+{
 }
 
-wxIcon& wxIcon::operator = ( const wxIcon& icon )
-{ 
-    if (*this == icon) return (*this); 
-    Ref(icon); 
-    return *this; 
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+{
+    wxIcon *icon = (wxIcon*)(&bmp);
+    *this = *icon;
 }
-