X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20b6985553b4e01e7960847e3211d940aeff8742..7b4a652a8bf3da1b2dd20dd22c9e6db5dd03db59:/include/wx/mac/carbon/bitmap.h

diff --git a/include/wx/mac/carbon/bitmap.h b/include/wx/mac/carbon/bitmap.h
index d9d2db1f2e..c051d22fdb 100644
--- a/include/wx/mac/carbon/bitmap.h
+++ b/include/wx/mac/carbon/bitmap.h
@@ -68,18 +68,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
@@ -193,12 +193,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