Digital Mars needs CCS_RIGHT

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

diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index fbd77dcd02ab4d1db3ec6aaf90db48b8e3b6c3f2..c22eb5e56225e1f28de1019fd580a6144e6c17a0 100644 (file)
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        icon.h
+// Name:        wx/motif/icon.h

 // Purpose:     wxIcon class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxIcon class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICON_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICON_H_


@@ -20,9 +20,6 @@ class WXDLLEXPORT wxIcon : public wxBitmap
 public:
     wxIcon();
 
 public:
     wxIcon();
 

-    // Copy constructors
-    inline wxIcon(const wxIcon& icon) { Ref(icon); }
-

     // Initialize with XBM data
     wxIcon(const char bits[], int width, int height);
 
     // Initialize with XBM data
     wxIcon(const char bits[], int width, int height);
 


@@ -41,7 +38,7 @@ public:
         LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ANY);
     }
 
         LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ANY);
     }
 

-    ~wxIcon();
+    virtual ~wxIcon();

 
     bool LoadFile(const wxString& name, wxBitmapType type,
                   int desiredWidth, int desiredHeight = -1);
 
     bool LoadFile(const wxString& name, wxBitmapType type,
                   int desiredWidth, int desiredHeight = -1);


@@ -58,8 +55,6 @@ public:
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);
 
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);
 

-    wxIcon& operator = (const wxIcon& icon)
-        { if (this != &icon) Ref(icon); return *this; }

     bool operator == (const wxIcon& icon) const
         { return m_refData == icon.m_refData; }
     bool operator != (const wxIcon& icon) const
     bool operator == (const wxIcon& icon) const
         { return m_refData == icon.m_refData; }
     bool operator != (const wxIcon& icon) const