adding metafile and clipboard support

[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 d9d2db1f2ebe0292f2053ddab672daae7170d7cb..054249c602d4d6817d49e42a1ee8fdc122930125 100644 (file)
--- 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() ;
     int GetBytesPerRow() const { return m_bytesPerRow ; }
     // renders/updates native representation when necessary 
     void RealizeNative() ;

-#if !wxMAC_USE_CORE_GRAPHICS
+

     WXHBITMAP GetHBITMAP() const ;
     WXHBITMAP GetHBITMAP() const ;

-#endif
+

 
 private:
     wxMemoryBuffer m_memBuf ;
     int m_bytesPerRow ;
     int m_width ;
     int m_height ;
 
 private:
     wxMemoryBuffer m_memBuf ;
     int m_bytesPerRow ;
     int m_width ;
     int m_height ;

-#if !wxMAC_USE_CORE_GRAPHICS
+

     WXHBITMAP m_maskBitmap ;
     WXHBITMAP m_maskBitmap ;

-#endif
+

 };
 
 class WXDLLEXPORT wxBitmapHandler: public wxBitmapHandlerBase
 };
 
 class WXDLLEXPORT wxBitmapHandler: public wxBitmapHandlerBase


@@ -193,10 +193,8 @@ public:
     bool HasAlpha() const;
     void UseAlpha();
 
     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;
     // 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
     // returns a CGImageRef which must released after usage with CGImageRelease
 
 #if wxMAC_USE_CORE_GRAPHICS
     // returns a CGImageRef which must released after usage with CGImageRelease