For consistency with the docs and with wxMSW the keycode for

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

diff --git a/src/gtk/icon.cpp b/src/gtk/icon.cpp
index 4788409a40d56515436f205d812465ebf5c1b1b3..776adeb423c7e036ece9217e5a2598d99f9e836b 100644 (file)
--- a/src/gtk/icon.cpp
+++ b/src/gtk/icon.cpp
@@ -2,15 +2,13 @@
 // Name:        icon.cpp
 // Purpose:
 // Author:      Robert Roebling
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 
 #include "wx/icon.h"
 


@@ -20,8 +18,34 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon,wxBitmap)
 
 
 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) ) :
 wxIcon::wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :

-    wxBitmap( bits ) 
+    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;

 }
 }

-