Reflect changes in stc.cpp in stc.cpp.in from which it's generated.

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

diff --git a/src/generic/icon.cpp b/src/generic/icon.cpp
index 0e79576a155d9b004366450bc5166e2d3fddbd52..ffe0335ad00f070fe3b595845d3844037b09e6ef 100644 (file)
--- a/src/generic/icon.cpp
+++ b/src/generic/icon.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -24,15 +23,17 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
 

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

     wxBitmap( bits )
 {
 }
 
     wxBitmap( bits )
 {
 }
 

-wxIcon::wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
+#ifdef wxNEEDS_CHARPP
+wxIcon::wxIcon(char **bits) :

     wxBitmap( bits )
 {
 }
     wxBitmap( bits )
 {
 }

+#endif

 
 wxIcon::wxIcon() :  wxBitmap()
 {
 
 wxIcon::wxIcon() :  wxBitmap()
 {