g_main_set_poll_func(x) -> g_main_context_set_poll_func(NULL, x). Former deprecated...

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

diff --git a/src/gtk/icon.cpp b/src/gtk/icon.cpp
index a65627746cd31285c5c35f1010a472c8015c5247..776adeb423c7e036ece9217e5a2598d99f9e836b 100644 (file)
--- a/src/gtk/icon.cpp
+++ b/src/gtk/icon.cpp
@@ -2,15 +2,13 @@
 // Name:        icon.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // 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"
 
@@ -20,3 +18,34 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon,wxBitmap)
 
+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::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;
+}