X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20b6985553b4e01e7960847e3211d940aeff8742..67650ea0b976c6d8a93c47858301a0a9d7c4bdf4:/include/wx/mac/carbon/bitmap.h?ds=sidebyside

diff --git a/include/wx/mac/carbon/bitmap.h b/include/wx/mac/carbon/bitmap.h
index d9d2db1f2e..fbeceb2993 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,10 +46,10 @@ 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();
+    virtual ~wxMask();
 
     bool Create(const wxBitmap& bitmap, const wxColour& colour);
     bool Create(const wxBitmap& bitmap);
@@ -68,18 +64,18 @@ public:
     int GetBytesPerRow() const { return m_bytesPerRow ; }
     // renders/updates native representation when necessary 
     void RealizeNative() ;
-#if !wxMAC_USE_CORE_GRAPHICS
+
     WXHBITMAP GetHBITMAP() const ;
-#endif
+
 
 private:
     wxMemoryBuffer m_memBuf ;
     int m_bytesPerRow ;
     int m_width ;
     int m_height ;
-#if !wxMAC_USE_CORE_GRAPHICS
+
     WXHBITMAP m_maskBitmap ;
-#endif
+
 };
 
 class WXDLLEXPORT wxBitmapHandler: public wxBitmapHandlerBase
@@ -108,10 +104,6 @@ class WXDLLEXPORT wxBitmap: public wxBitmapBase
 public:
     wxBitmap(); // Platform-specific
 
-    // Copy constructors
-    wxBitmap(const wxBitmap& bitmap)
-    { Ref(bitmap); }
-
     // Initialize with raw data.
     wxBitmap(const char bits[], int width, int height, int depth = 1);
 
@@ -135,7 +127,7 @@ public:
     // Convert from wxIcon
     wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
 
-    ~wxBitmap();
+    virtual ~wxBitmap();
 
     wxImage ConvertToImage() const;
 
@@ -178,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; }
 
@@ -193,12 +184,10 @@ public:
     bool HasAlpha() const;
     void UseAlpha();
 
-#if !wxMAC_USE_CORE_GRAPHICS
     // returns the 'native' implementation, a GWorldPtr for the content and one for the mask 
     WXHBITMAP GetHBITMAP( WXHBITMAP * mask = NULL ) const;
-#endif
 
-#if wxMAC_USE_CORE_GRAPHICS
+#ifdef __WXMAC_OSX__
     // returns a CGImageRef which must released after usage with CGImageRelease
     WXCGIMAGEREF CGImageCreate() const ;
 #endif