Commited FRM's stockitem patch (empty stock items).

[wxWidgets.git] / include / wx / os2 / icon.h

diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index b4ecbd07a106f0dddc894ec06f709edcf20d21a3..08f54374f2d158dd1c58cadf3e09029b28c5bc01 100644 (file)
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -6,7 +6,7 @@
 // Created:     10/09/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICON_H_
@@ -16,23 +16,11 @@
 // headers
 // ----------------------------------------------------------------------------
 
-// compatible (even if incorrect) behaviour by default: derive wxIcon from
-// wxBitmap
-#ifndef wxICON_IS_BITMAP
-    #define wxICON_IS_BITMAP 1
-#endif
-
 #include "wx/bitmap.h"
-#if wxICON_IS_BITMAP
+#include "wx/os2/gdiimage.h"
 
-    #define wxIconRefDataBase   wxBitmapRefData
-    #define wxIconBase          wxBitmap
-#else
-    #include "wx/os2/gdiimage.h"
-
-    #define wxIconRefDataBase   wxGDIImageRefData
-    #define wxIconBase          wxGDIImage
-#endif
+#define wxIconRefDataBase   wxGDIImageRefData
+#define wxIconBase          wxGDIImage
 
 class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase
 {
@@ -52,9 +40,6 @@ class WXDLLEXPORT wxIcon: public wxIconBase
 public:
     wxIcon();
 
-    // Copy constructors
-    inline wxIcon(const wxIcon& icon) { Ref(icon); }
-
     wxIcon( const char bits[]
            ,int        nWidth
            ,int        nHeight
@@ -79,8 +64,6 @@ public:
                   ,int             nDesiredHeight = -1
                  );
 
-    inline wxIcon& operator = (const wxIcon& rIcon)
-       { if (*this != rIcon) Ref(rIcon); return *this; }
     inline bool operator == (const wxIcon& rIcon) const
        { return m_refData == rIcon.m_refData; }
     inline bool operator != (const wxIcon& rIcon) const