implemented alpha support for raw bitmaps under Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -94,6 +94,7 @@ public:
|
||||
WXHBITMAP m_hBitmap;
|
||||
WXHICON m_hIcon ;
|
||||
wxMask * m_bitmapMask; // Optional mask
|
||||
bool m_hasAlpha;
|
||||
};
|
||||
|
||||
#define M_BITMAPDATA ((wxBitmapRefData *)m_refData)
|
||||
@@ -199,7 +200,7 @@ public:
|
||||
|
||||
static void InitStandardHandlers();
|
||||
|
||||
// raw bitmap access support functions
|
||||
// raw bitmap access support functions, for internal use only
|
||||
void *GetRawData(wxPixelDataBase& data, int bpp);
|
||||
void UngetRawData(wxPixelDataBase& data);
|
||||
|
||||
|
@@ -196,6 +196,8 @@ public:
|
||||
int GetWidth() const { return m_width; }
|
||||
int GetHeight() const { return m_height; }
|
||||
|
||||
wxSize GetSize() const { return wxSize(m_width, m_height); }
|
||||
|
||||
// the distance between two rows
|
||||
int GetRowStride() const { return m_stride; }
|
||||
|
||||
@@ -567,10 +569,9 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
|
||||
|
||||
// private: -- see comment in the beginning of the file
|
||||
|
||||
// NB: for efficiency reasons this class must *not* have any other
|
||||
// fields, otherwise it won't be put into a CPU register (as it
|
||||
// should inside the inner loops) by some compilers, notably
|
||||
// gcc
|
||||
// for efficiency reasons this class should not have any other
|
||||
// fields, otherwise it won't be put into a CPU register (as it
|
||||
// should inside the inner loops) by some compilers, notably gcc
|
||||
ChannelType *m_ptr;
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user