X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ff64980aaae854d35260b57449dd46fb2f70954..3ef092d63b3757744beb71a61a3b818e207632b3:/include/wx/msw/bitmap.h diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index 701c4a8c9e..c9d9e38445 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -12,10 +12,6 @@ #ifndef _WX_BITMAP_H_ #define _WX_BITMAP_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "bitmap.h" -#endif - #include "wx/msw/gdiimage.h" #include "wx/gdicmn.h" #include "wx/palette.h" @@ -46,7 +42,7 @@ public: wxBitmap() { Init(); } // Copy constructors - wxBitmap(const wxBitmap& bitmap) { Init(); Ref(bitmap); } + wxBitmap(const wxBitmap& bitmap) : wxGDIImage(bitmap) { Init(); Ref(bitmap); } // Initialize with raw data wxBitmap(const char bits[], int width, int height, int depth = 1); @@ -145,6 +141,7 @@ public: #endif // wxUSE_PALETTE wxMask *GetMask() const; + wxBitmap GetMaskBitmap() const; void SetMask(wxMask *mask); bool operator==(const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }