Restore compilation with --enable-stl, fix SetFocus with the generic control, and...

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

diff --git a/include/wx/mac/carbon/bitmap.h b/include/wx/mac/carbon/bitmap.h
index a607ec3e9df72141f679bd1f35b3d74a0a8f1b1a..418586576b1dfbd1a166dbc1772f6ed591c74704 100644 (file)
--- a/include/wx/mac/carbon/bitmap.h
+++ b/include/wx/mac/carbon/bitmap.h
@@ -34,11 +34,13 @@ class WXDLLEXPORT wxPixelDataBase;
 class WXDLLEXPORT wxMask: public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxMask)
-    DECLARE_NO_COPY_CLASS(wxMask)
 
 public:
     wxMask();
 
+    // Copy constructor
+    wxMask(const wxMask& mask);
+
     // Construct a mask from a bitmap and a colour indicating
     // the transparent area
     wxMask(const wxBitmap& bitmap, const wxColour& colour);
@@ -132,7 +134,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;
@@ -156,9 +159,6 @@ public:
     wxMask *GetMask() const;
     void SetMask(wxMask *mask) ;
 
-    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; }
-
     static void InitStandardHandlers();
 
     // raw bitmap access support functions, for internal use only
@@ -183,6 +183,11 @@ public:
     // makes sure that no cached images will be constructed until terminated
     void *BeginRawAccess() ;
     void EndRawAccess() ;
+
+protected:
+    // ref counting code
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 };
 #endif
   // _WX_BITMAP_H_