don't require multimon.h any more now (patch 1446030); enable wxUSE_DISPLAY by default

[wxWidgets.git] / src / gtk / icon.cpp

diff --git a/src/gtk/icon.cpp b/src/gtk/icon.cpp
index a372cb986937e65e06db475ee2835faae3b52271..0d82d6830b2c755e12f86e6bf867909d0a55371c 100644 (file)
--- a/src/gtk/icon.cpp
+++ b/src/gtk/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"
 
@@ -33,15 +32,8 @@ wxIcon::wxIcon() :  wxBitmap()
 {
 }
 
-wxIcon::wxIcon( const wxIcon& icon ) : wxBitmap()
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 {
-    Ref(icon);
+    wxIcon *icon = (wxIcon*)(&bmp);
+    *this = *icon;
 }
-
-wxIcon& wxIcon::operator = ( const wxIcon& icon )
-{
-    if (*this == icon) return (*this);
-    Ref(icon);
-    return *this;
-}
-