Bump subrelease number

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

diff --git a/src/gtk/icon.cpp b/src/gtk/icon.cpp
index 33d85df2ac9283f7e59fb4ef2ff6c4ecb9eb09be..ef9780a56cabe17cdc35978a8e3523cc2f748bf2 100644 (file)
--- a/src/gtk/icon.cpp
+++ b/src/gtk/icon.cpp
@@ -2,16 +2,18 @@
 // 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "icon.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
@@ -20,29 +22,34 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon,wxBitmap)
 
-wxIcon::wxIcon( 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() :  wxBitmap() 
-{  
+
+wxIcon::wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
+    wxBitmap( bits )
+{
 }
 
-wxIcon::wxIcon(const wxIcon& icon) : wxBitmap()
-{ 
-  Ref(icon); 
+wxIcon::wxIcon() :  wxBitmap()
+{
 }
 
-wxIcon::wxIcon(const wxIcon* icon) : wxBitmap()
-{ 
-  if (icon) Ref(*icon); 
+wxIcon::wxIcon( const wxIcon& icon ) : wxBitmap()
+{
+    Ref(icon);
 }
 
-wxIcon& wxIcon::operator = (const wxIcon& icon) 
-{ 
-  if (*this == icon) return (*this); 
-  Ref(icon); 
-  return *this; 
+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;
+}