Reverting previous commit

[wxWidgets.git] / include / wx / msw / bitmap.h

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 701c4a8c9ecf1deb4c98f0c00ea0d201aef439ac..b60793bbe4f3c75312ea6329145166af09afa970 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -46,7 +46,7 @@ public:
     wxBitmap() { Init(); }
 
     // Copy constructors
     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);
 
     // Initialize with raw data
     wxBitmap(const char bits[], int width, int height, int depth = 1);


@@ -145,6 +145,7 @@ public:
 #endif // wxUSE_PALETTE
 
     wxMask *GetMask() const;
 #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; }
     void SetMask(wxMask *mask);
 
     bool operator==(const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }