Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

icon support moved to wxBitmap, allowing for fully transparent usage

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2001-05-16 16:23:13 +00:00
parent 513903c4f9
commit 3dec57adfd
20 changed files with 1273 additions and 808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/mac/bitmap.h
View File

@@ -69,7 +69,7 @@ protected:
WXHBITMAP m_maskBitmap;
};
enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict } ;
enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict , kMacBitmapTypeIcon } ;
class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
{
@@ -92,6 +92,7 @@ public:
int m_bitmapType ;
PicHandle m_hPict ;
WXHBITMAP m_hBitmap;
WXHICON m_hIcon ;
wxMask * m_bitmapMask; // Optional mask
};
@@ -211,6 +212,8 @@ protected:
public:
void SetHBITMAP(WXHBITMAP bmp);
WXHBITMAP GetHBITMAP() const;
void SetHICON(WXHICON ico);
inline WXHICON GetHICON() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hIcon : 0); }
PicHandle GetPict() const;