cleanup for Core Graphics / removing QD

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-05-16 16:17:31 +00:00
parent ef7bf59cb8
commit 251163b92c

View File

@@ -1227,13 +1227,13 @@ public:
// returns a Pict from the bitmap content // returns a Pict from the bitmap content
PicHandle GetPictHandle(); PicHandle GetPictHandle();
#ifdef __LP64__ #if wxMAC_USE_CORE_GRAPHICS
CGContextRef GetHBITMAP(CGContextRef * mask = NULL ) const; CGContextRef GetBitmapContext() const;
#else #else
GWorldPtr GetHBITMAP(GWorldPtr * mask = NULL ) const; GWorldPtr GetHBITMAP(GWorldPtr * mask = NULL ) const;
#endif
void UpdateAlphaMask() const; void UpdateAlphaMask() const;
#endif
int GetBytesPerRow() const { return m_bytesPerRow; }
private : private :
bool Create(int width , int height , int depth); bool Create(int width , int height , int depth);
void Init(); void Init();
@@ -1251,14 +1251,13 @@ private :
#endif #endif
IconRef m_iconRef; IconRef m_iconRef;
PicHandle m_pictHandle; PicHandle m_pictHandle;
wxMemoryBuffer m_maskMemBuf; #if wxMAC_USE_CORE_GRAPHICS
int m_maskBytesPerRow;
#ifdef __LP64__
CGContextRef m_hBitmap; CGContextRef m_hBitmap;
CGContextRef m_hMaskBitmap;
#else #else
GWorldPtr m_hBitmap; GWorldPtr m_hBitmap;
GWorldPtr m_hMaskBitmap; GWorldPtr m_hMaskBitmap;
wxMemoryBuffer m_maskMemBuf;
int m_maskBytesPerRow;
#endif #endif
}; };