X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7d667c57be0297ff49739519e4adb8a5ea09ee5..93f0fe75dd4ac59ef50b8bb2ce90738cb6a717b7:/include/wx/mac/bitmap.h?ds=sidebyside diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h index b06e1030e8..5e58198e53 100644 --- a/include/wx/mac/bitmap.h +++ b/include/wx/mac/bitmap.h @@ -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;