X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0794a4ccd8df2fe136f2f0bef96c6e05c29721a..81853b98619293be66074d74d2557973c0f3ab21:/include/wx/mac/carbon/bitmap.h diff --git a/include/wx/mac/carbon/bitmap.h b/include/wx/mac/carbon/bitmap.h index ff0c31c02c..29772d299b 100644 --- a/include/wx/mac/carbon/bitmap.h +++ b/include/wx/mac/carbon/bitmap.h @@ -12,10 +12,6 @@ #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 (black meaning show pixels, white meaning transparent) wxMask(const wxBitmap& bitmap); - // implementation helper only : construct a mask from a 8 bit memory buffer + // implementation helper only : construct a mask from a 32 bit memory buffer wxMask(const wxMemoryBuffer& buf, int width , int height , int bytesPerRow ) ; ~wxMask(); @@ -108,13 +104,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); @@ -181,7 +170,6 @@ public: wxMask *GetMask() const; void SetMask(wxMask *mask) ; - 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; }