Several wxBitmapDataCell changes.

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

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 7d688bc7886b823b81173f8cfb38520e4349d0ae..b12e30dbeaee1aedd3bdbd6d80cbb27084cbce4b 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -21,13 +21,54 @@
 #include "wx/string.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"  // for wxBitmapType
+#include "wx/colour.h"
 
 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxBitmapHandler;
+class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxImage;
 class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxPalette;
 
+// ----------------------------------------------------------------------------
+// wxVariant support
+// ----------------------------------------------------------------------------
+
+#if wxUSE_VARIANT
+#include "wx/variant.h"
+DECLARE_VARIANT_OBJECT_EXPORTED(wxBitmap,WXDLLEXPORT)
+#endif
+
+// ----------------------------------------------------------------------------
+// wxMask represents the transparent area of the bitmap
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxMaskBase : public wxObject
+{
+public:
+    // create the mask from bitmap pixels of the given colour
+    bool Create(const wxBitmap& bitmap, const wxColour& colour);
+
+#if wxUSE_PALETTE
+    // create the mask from bitmap pixels with the given palette index
+    bool Create(const wxBitmap& bitmap, int paletteIndex);
+#endif // wxUSE_PALETTE
+
+    // create the mask from the given mono bitmap
+    bool Create(const wxBitmap& bitmap);
+
+protected:
+    // this function is called from Create() to free the existing mask data
+    virtual void FreeData() = 0;
+
+    // these functions must be overridden to implement the corresponding public
+    // Create() methods, they shouldn't call FreeData() as it's already called
+    // by the public wrappers
+    virtual bool InitFromColour(const wxBitmap& bitmap,
+                                const wxColour& colour) = 0;
+    virtual bool InitFromMonoBitmap(const wxBitmap& bitmap) = 0;
+};
+
 #if defined(__WXMGL__) || \
     defined(__WXDFB__) || \
     defined(__WXMAC__) || \
@@ -35,8 +76,14 @@ class WXDLLEXPORT wxPalette;
     defined(__WXCOCOA__) || \
     defined(__WXMOTIF__) || \
     defined(__WXX11__)
+    #define wxUSE_BITMAP_BASE 1
+#else
+    #define wxUSE_BITMAP_BASE 0
+#endif
+
 // Only used by some ports
 // FIXME -- make all ports (but MSW which uses wxGDIImage) use these base classes
+#if wxUSE_BITMAP_BASE
 
 // ----------------------------------------------------------------------------
 // wxBitmapHandler: class which knows how to create/load/save bitmaps in
@@ -150,36 +197,56 @@ public:
 
     static void CleanUpHandlers();
 
+    // this method is only used by the generic implementation of wxMask
+    // currently but could be useful elsewhere in the future: it can be
+    // overridden to quantize the colour to correspond to bitmap colour depth
+    // if necessary; default implementation simply returns the colour as is
+    virtual wxColour QuantizeColour(const wxColour& colour) const
+    {
+        return colour;
+    }
+
 protected:
     static wxList sm_handlers;
 
     DECLARE_ABSTRACT_CLASS(wxBitmapBase)
 };
-#endif
+
+#endif // wxUSE_BITMAP_BASE
 
 #if defined(__WXPALMOS__)
-#include "wx/palmos/bitmap.h"
+    #include "wx/palmos/bitmap.h"
 #elif defined(__WXMSW__)
-#include "wx/msw/bitmap.h"
+    #include "wx/msw/bitmap.h"
 #elif defined(__WXMOTIF__)
-#include "wx/x11/bitmap.h"
+    #include "wx/x11/bitmap.h"
 #elif defined(__WXGTK20__)
-#include "wx/gtk/bitmap.h"
+    #include "wx/gtk/bitmap.h"
 #elif defined(__WXGTK__)
-#include "wx/gtk1/bitmap.h"
+    #include "wx/gtk1/bitmap.h"
 #elif defined(__WXX11__)
-#include "wx/x11/bitmap.h"
+    #include "wx/x11/bitmap.h"
 #elif defined(__WXMGL__)
-#include "wx/mgl/bitmap.h"
+    #include "wx/mgl/bitmap.h"
 #elif defined(__WXDFB__)
-#include "wx/dfb/bitmap.h"
+    #include "wx/dfb/bitmap.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/bitmap.h"
+    #include "wx/mac/bitmap.h"
 #elif defined(__WXCOCOA__)
-#include "wx/cocoa/bitmap.h"
+    #include "wx/cocoa/bitmap.h"
 #elif defined(__WXPM__)
-#include "wx/os2/bitmap.h"
+    #include "wx/os2/bitmap.h"
 #endif
 
+// we must include generic mask.h after wxBitmap definition
+#if defined(__WXMGL__) || defined(__WXDFB__)
+    #define wxUSE_GENERIC_MASK 1
+#else
+    #define wxUSE_GENERIC_MASK 0
 #endif
-    // _WX_BITMAP_H_BASE_
+
+#if wxUSE_GENERIC_MASK
+    #include "wx/generic/mask.h"
+#endif
+
+#endif // _WX_BITMAP_H_BASE_