X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4562386dc57b2aa65bbfa26c45561f5be57eba87..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/dfb/bitmap.h?ds=sidebyside diff --git a/include/wx/dfb/bitmap.h b/include/wx/dfb/bitmap.h index 8500bf435f..e7335658e5 100644 --- a/include/wx/dfb/bitmap.h +++ b/include/wx/dfb/bitmap.h @@ -13,72 +13,32 @@ #include "wx/dfb/dfbptr.h" -wxDFB_DECLARE_INTERFACE(IDirectFBSurface); - -//----------------------------------------------------------------------------- -// wxMask -//----------------------------------------------------------------------------- - -#warning "FIXME: move wxMask to common code" -class WXDLLIMPEXP_CORE wxMask: public wxObject -{ -public: - wxMask(); - wxMask(const wxBitmap& bitmap); - wxMask(const wxBitmap& bitmap, const wxColour& colour); -#if wxUSE_PALETTE - wxMask(const wxBitmap& bitmap, int paletteIndex); -#endif - wxMask(const wxMask& mask); - ~wxMask(); - - bool Create(const wxBitmap& bitmap); - bool Create(const wxBitmap& bitmap, const wxColour& colour); -#if wxUSE_PALETTE - bool Create(const wxBitmap& bitmap, int paletteIndex); -#endif +class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; - // implementation - const wxBitmap& GetBitmap() const; - -private: - wxBitmap *m_bitmap; - - DECLARE_DYNAMIC_CLASS(wxMask) -}; +wxDFB_DECLARE_INTERFACE(IDirectFBSurface); //----------------------------------------------------------------------------- // wxBitmap //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxBitmapHandler : public wxBitmapHandlerBase -{ -public: - wxBitmapHandler() : wxBitmapHandlerBase() {} -private: - DECLARE_DYNAMIC_CLASS(wxBitmapHandler) -}; - -class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase +class WXDLLIMPEXP_CORE wxBitmap : public wxBitmapBase { public: wxBitmap() {} wxBitmap(const wxIDirectFBSurfacePtr& surface) { Create(surface); } - wxBitmap(int width, int height, int depth = -1); + wxBitmap(int width, int height, int depth = -1) { Create(width, height, depth); } + wxBitmap(const wxSize& sz, int depth = -1) { Create(sz, depth); } wxBitmap(const char bits[], int width, int height, int depth = 1); - wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE); - wxBitmap(const char **bits) { CreateFromXpm(bits); } - wxBitmap(char **bits) { CreateFromXpm((const char **)bits); } + wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); + wxBitmap(const char* const* bits); #if wxUSE_IMAGE wxBitmap(const wxImage& image, int depth = -1); #endif - bool Ok() const; - bool operator==(const wxBitmap& bmp) const; - bool operator!=(const wxBitmap& bmp) const { return !(*this == bmp); } - bool Create(const wxIDirectFBSurfacePtr& surface); - bool Create(int width, int height, int depth = -1); + bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); + bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) + { return Create(sz.GetWidth(), sz.GetHeight(), depth); } virtual int GetHeight() const; virtual int GetWidth() const; @@ -93,8 +53,9 @@ public: virtual wxBitmap GetSubBitmap(const wxRect& rect) const; - virtual bool SaveFile(const wxString &name, wxBitmapType type, const wxPalette *palette = (wxPalette *) NULL) const; - virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_TYPE_RESOURCE); + virtual bool SaveFile(const wxString &name, wxBitmapType type, + const wxPalette *palette = NULL) const; + virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); #if wxUSE_PALETTE virtual wxPalette *GetPalette() const; @@ -106,6 +67,12 @@ public: static void InitStandardHandlers(); + // raw bitmap access support functions + void *GetRawData(wxPixelDataBase& data, int bpp); + void UngetRawData(wxPixelDataBase& data); + + bool HasAlpha() const; + // implementation: virtual void SetHeight(int height); virtual void SetWidth(int width); @@ -115,11 +82,10 @@ public: wxIDirectFBSurfacePtr GetDirectFBSurface() const; protected: - bool CreateFromXpm(const char **bits); + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - // ref counting code - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + bool CreateWithFormat(int width, int height, int dfbFormat); DECLARE_DYNAMIC_CLASS(wxBitmap) };