X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cfd8e74094ed631e68f7baf6e506611559362d81..e4e83f385a58f00b1f97315ebd80f380d16ae472:/include/wx/msw/bitmap.h

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 9a2b830e43..edd355e23a 100644
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -13,7 +13,6 @@
 #define _WX_BITMAP_H_
 
 #include "wx/msw/gdiimage.h"
-#include "wx/gdicmn.h"
 #include "wx/palette.h"
 
 class WXDLLEXPORT wxBitmap;
@@ -46,6 +45,12 @@ public:
 
     // Initialize with XPM data
     wxBitmap(const char* const* data);
+#ifdef wxNEEDS_CHARPP
+    wxBitmap(char** data)
+    {
+        *this = wxBitmap(wx_const_cast(const char* const*, data));
+    }
+#endif
 
     // Load a file or resource
     wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE);
@@ -133,21 +138,11 @@ public:
     wxBitmap GetMaskBitmap() const;
     void SetMask(wxMask *mask);
 
-    bool operator==(const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }
-    bool operator!=(const wxBitmap& bitmap) const { return m_refData != bitmap.m_refData; }
-
     // these functions are internal and shouldn't be used, they risk to
     // disappear in the future
     bool HasAlpha() const;
     void UseAlpha();
 
-#if WXWIN_COMPATIBILITY_2_4
-    // these functions do nothing and are only there for backwards
-    // compatibility
-    wxDEPRECATED( int GetQuality() const );
-    wxDEPRECATED( void SetQuality(int quality) );
-#endif // WXWIN_COMPATIBILITY_2_4
-
     // implementation only from now on
     // -------------------------------
 
@@ -195,6 +190,9 @@ class WXDLLEXPORT wxMask : public wxObject
 public:
     wxMask();
 
+    // Copy constructor
+    wxMask(const wxMask &mask);
+
     // Construct a mask from a bitmap and a colour indicating the transparent
     // area
     wxMask(const wxBitmap& bitmap, const wxColour& colour);
@@ -232,7 +230,7 @@ protected:
 class WXDLLEXPORT wxBitmapHandler : public wxGDIImageHandler
 {
 public:
-    wxBitmapHandler() { m_type = wxBITMAP_TYPE_INVALID; }
+    wxBitmapHandler() { }
     wxBitmapHandler(const wxString& name, const wxString& ext, long type)
         : wxGDIImageHandler(name, ext, type)
     {
@@ -243,26 +241,15 @@ public:
     virtual bool Create(wxBitmap *bitmap,
                         const void* data,
                         long flags,
-                        int width, int height, int depth = 1)
-    {
-        return Create((wxGDIImage *)bitmap, data, flags, width, height, depth);
-    }
-
+                        int width, int height, int depth = 1);
     virtual bool LoadFile(wxBitmap *bitmap,
                           const wxString& name,
                           long flags,
-                          int desiredWidth, int desiredHeight)
-    {
-        return Load(bitmap, name, flags, desiredWidth, desiredHeight);
-    }
-
+                          int desiredWidth, int desiredHeight);
     virtual bool SaveFile(wxBitmap *bitmap,
                           const wxString& name,
                           int type,
-                          const wxPalette * WXUNUSED(palette) = NULL)
-    {
-        return Save(bitmap, name, type);
-    }
+                          const wxPalette *palette = NULL);
 
     virtual bool Create(wxGDIImage *image,
                         const void* data,