[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/gtk/icon.cpp b/src/gtk/icon.cpp
index 7ab44845375870a4f734f40d79b1ff40c85d8da0..ef9780a56cabe17cdc35978a8e3523cc2f748bf2 100644 (file)
--- a/src/gtk/icon.cpp
+++ b/src/gtk/icon.cpp
@@ -2,16 +2,18 @@
 // 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "icon.h"
 #endif
 
 #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 +22,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;
+}