X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..3abcf424a3e250f5537f9f076d3fb86a925e2547:/include/wx/mac/classic/bitmap.h

diff --git a/include/wx/mac/classic/bitmap.h b/include/wx/mac/classic/bitmap.h
index 428c0e19a9..b3997a4122 100644
--- a/include/wx/mac/classic/bitmap.h
+++ b/include/wx/mac/classic/bitmap.h
@@ -6,16 +6,12 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-  #pragma interface "bitmap.h"
-#endif
-
 #include "wx/palette.h"
 
 // Bitmap
@@ -50,7 +46,7 @@ public:
   // Construct a mask from a mono bitmap (copies the bitmap).
   wxMask(const wxBitmap& bitmap);
 
-  ~wxMask();
+  virtual ~wxMask();
 
   bool Create(const wxBitmap& bitmap, const wxColour& colour);
   bool Create(const wxBitmap& bitmap, int paletteIndex);
@@ -78,7 +74,7 @@ class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxCursor;
 public:
     wxBitmapRefData();
-    ~wxBitmapRefData();
+    virtual ~wxBitmapRefData();
 
 public:
   int           m_width;
@@ -137,11 +133,6 @@ class WXDLLEXPORT wxBitmap: public wxBitmapBase
 public:
   wxBitmap(); // Platform-specific
 
-  // Copy constructors
-  wxBitmap(const wxBitmap& bitmap)
-      : wxBitmapBase()
-  { Ref(bitmap); }
-
   // Initialize with raw data.
   wxBitmap(const char bits[], int width, int height, int depth = 1);
 
@@ -162,7 +153,7 @@ public:
   // Convert from wxImage:
   wxBitmap(const wxImage& image, int depth = -1);
   
-  ~wxBitmap();
+  virtual ~wxBitmap();
   
   wxImage ConvertToImage() const;
 
@@ -177,7 +168,8 @@ public:
   // copies the contents and mask of the given (colour) icon to the bitmap
   virtual bool CopyFromIcon(const wxIcon& icon);
 
-  bool Ok() const;
+  bool Ok() const { return IsOk(); }
+  bool IsOk() const;
   int GetWidth() const;
   int GetHeight() const;
   int GetDepth() const;
@@ -198,7 +190,6 @@ public:
 
   int GetBitmapType() const;
   
-  inline wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; }
   inline bool operator == (const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }
   inline bool operator != (const wxBitmap& bitmap) const { return m_refData != bitmap.m_refData; }