compilation fix: wxGenericCollapsiblePane needs wxButton and wxStaticLine

[wxWidgets.git] / include / wx / mac / classic / bitmap.h

diff --git a/include/wx/mac/classic/bitmap.h b/include/wx/mac/classic/bitmap.h
index 70bfdb494916b8187bfb0892c5c9b01000b1141d..b3997a41221062f93a883da3219f556447f5101e 100644 (file)
--- a/include/wx/mac/classic/bitmap.h
+++ b/include/wx/mac/classic/bitmap.h
@@ -46,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);
@@ -74,7 +74,7 @@ class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxCursor;
 public:
     wxBitmapRefData();
-    ~wxBitmapRefData();
+    virtual ~wxBitmapRefData();
 
 public:
   int           m_width;
@@ -133,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);
 
@@ -158,7 +153,7 @@ public:
   // Convert from wxImage:
   wxBitmap(const wxImage& image, int depth = -1);
   
-  ~wxBitmap();
+  virtual ~wxBitmap();
   
   wxImage ConvertToImage() const;
 
@@ -173,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;
@@ -194,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; }