wxDisplay cleanup/rewrite:

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

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 90bcc1e7f382d521c472e6daf3e299c0bf7e7486..1959abaaf8f288d27b1bf9a7602c3edca27bdb2d 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -12,10 +12,6 @@
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 
 #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"
 #include "wx/msw/gdiimage.h"
 #include "wx/gdicmn.h"
 #include "wx/palette.h"


@@ -43,10 +39,7 @@ class WXDLLEXPORT wxBitmap : public wxGDIImage
 {
 public:
     // default ctor creates an invalid bitmap, you must Create() it later
 {
 public:
     // default ctor creates an invalid bitmap, you must Create() it later

-    wxBitmap() { Init(); }
-
-    // Copy constructors
-    wxBitmap(const wxBitmap& bitmap) : wxGDIImage(bitmap) { Init(); Ref(bitmap); }
+    wxBitmap() { }

 
     // 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);


@@ -83,14 +76,7 @@ public:
 
     // we must have this, otherwise icons are silently copied into bitmaps using
     // the copy ctor but the resulting bitmap is invalid!
 
     // we must have this, otherwise icons are silently copied into bitmaps using
     // the copy ctor but the resulting bitmap is invalid!

-    wxBitmap(const wxIcon& icon) { Init(); CopyFromIcon(icon); }
-
-    wxBitmap& operator=(const wxBitmap& bitmap)
-    {
-        if ( m_refData != bitmap.m_refData )
-            Ref(bitmap);
-        return *this;
-    }
+    wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }

 
     wxBitmap& operator=(const wxIcon& icon)
     {
 
     wxBitmap& operator=(const wxIcon& icon)
     {


@@ -145,6 +131,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; }


@@ -175,9 +162,6 @@ public:
 #endif // __WXDEBUG__
 
 protected:
 #endif // __WXDEBUG__
 
 protected:

-    // common part of all ctors
-    void Init();
-

     virtual wxGDIImageRefData *CreateData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
     virtual wxGDIImageRefData *CreateData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;