changed wxDC::GetTextExtent() and related methods to take const wxFont pointer, for...

[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 865ee73a905fb28b752ed03d8a9dbafc381204e3..e2a5a5b57e843980f1f0c7eac998e954b145c416 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);
@@ -142,13 +144,6 @@ public:
     void SetDepth(int d);
     void SetOk(bool isOk);
 
-#if WXWIN_COMPATIBILITY_2_4
-    // these functions do nothing and are only there for backwards
-    // compatibility
-    wxDEPRECATED( int GetQuality() const );
-    wxDEPRECATED( void SetQuality(int quality) );
-#endif // WXWIN_COMPATIBILITY_2_4
-
 #if wxUSE_PALETTE
     wxPalette* GetPalette() const;
     void SetPalette(const wxPalette& palette);
@@ -181,6 +176,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_