toplevel code transferred to wxTopLevelWindow

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

diff --git a/src/gtk/icon.cpp b/src/gtk/icon.cpp
index 94952e31ffed73c56a0e4807ac3ff8adcad32ea5..05c1089158624aafc3057a570c22c04204fc849b 100644 (file)
--- a/src/gtk/icon.cpp
+++ b/src/gtk/icon.cpp
@@ -19,29 +19,34 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon,wxBitmap)
 
 
 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;
+}