X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4611dd06a1c5f016fd5b4c5384bbe4620f8af3e9..283c797c5c79a25d6998abe1ab6cc1b17260dc19:/include/wx/bitmap.h

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index f5f6b51ceb..0b5da2e630 100644
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -16,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "bitmapbase.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
@@ -28,18 +24,56 @@
 
 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxBitmapHandler;
+class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxImage;
 class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxPalette;
 
+// ----------------------------------------------------------------------------
+// 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__) || \
     defined(__WXGTK__) || \
     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
@@ -64,27 +98,25 @@ public:
     virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
                           int type, const wxPalette *palette = NULL) = 0;
 
-    void SetName(const wxString& name) { m_name = name; }
-    void SetExtension(const wxString& ext) { m_extension = ext; }
-    void SetType(wxBitmapType type) { m_type = type; }
-    wxString GetName() const { return m_name; }
-    wxString GetExtension() const { return m_extension; }
-    wxBitmapType GetType() const { return m_type; }
+    void SetName(const wxString& name)      { m_name = name; }
+    void SetExtension(const wxString& ext)  { m_extension = ext; }
+    void SetType(wxBitmapType type)         { m_type = type; }
+    wxString GetName() const                { return m_name; }
+    wxString GetExtension() const           { return m_extension; }
+    wxBitmapType GetType() const            { return m_type; }
 
-protected:
+private:
     wxString      m_name;
     wxString      m_extension;
     wxBitmapType  m_type;
 
+private:
     DECLARE_ABSTRACT_CLASS(wxBitmapHandlerBase)
 };
 
 class WXDLLEXPORT wxBitmapBase : public wxGDIObject
 {
 public:
-    wxBitmapBase() : wxGDIObject() {}
-    virtual ~wxBitmapBase() {}
-
     /*
     Derived class must implement these:
 
@@ -93,10 +125,8 @@ public:
     wxBitmap(const char bits[], int width, int height, int depth = 1);
     wxBitmap(const char **bits);
     wxBitmap(char **bits);
-    wxBitmap(const wxBitmap& bmp);
     wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM);
     wxBitmap(const wxImage& image, int depth = -1);
-    wxBitmap& operator = (const wxBitmap& bmp);
     bool operator == (const wxBitmap& bmp) const;
     bool operator != (const wxBitmap& bmp) const;
 
@@ -157,32 +187,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"
 #elif defined(__WXGTK__)
-#include "wx/gtk/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"
 #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_