Added wxMiniFrame

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

diff --git a/src/gtk1/icon.cpp b/src/gtk1/icon.cpp
index 7ab44845375870a4f734f40d79b1ff40c85d8da0..37ce52b757ffcf07611ad4f4ec58ddb75efe8cad 100644 (file)
--- a/src/gtk1/icon.cpp
+++ b/src/gtk1/icon.cpp
@@ -2,9 +2,8 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -20,8 +19,34 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon,wxBitmap)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon,wxBitmap)
 

-wxIcon::wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
+wxIcon::wxIcon( const char **bits, int WXUNUSED(width), int WXUNUSED(height) ) : 

     wxBitmap( bits ) 
 {
     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( const wxIcon* icon ) : wxBitmap()
+{ 
+    if (icon) Ref(*icon); 
+}
+
+wxIcon& wxIcon::operator = ( const wxIcon& icon )
+{ 
+    if (*this == icon) return (*this); 
+    Ref(icon); 
+    return *this; 
+}
+