X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/650c0aa9180563eece310851973171cfaac83ad8..465de0be705e52c7f97e9bb6169af9d20a7f72a8:/include/wx/gtk/bitmap.h?ds=sidebyside diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index d78e4cab6d..d176833ca8 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -10,6 +10,10 @@ #ifndef _WX_GTK_BITMAP_H_ #define _WX_GTK_BITMAP_H_ +#ifdef __WXGTK3__ +typedef struct _cairo cairo_t; +typedef struct _cairo_surface cairo_surface_t; +#endif typedef struct _GdkPixbuf GdkPixbuf; class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; @@ -17,10 +21,11 @@ class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; // wxMask //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxMask: public wxObject +class WXDLLIMPEXP_CORE wxMask: public wxMaskBase { public: wxMask(); + wxMask(const wxMask& mask); wxMask( const wxBitmap& bitmap, const wxColour& colour ); #if wxUSE_PALETTE wxMask( const wxBitmap& bitmap, int paletteIndex ); @@ -28,18 +33,27 @@ public: wxMask( const wxBitmap& bitmap ); virtual ~wxMask(); - bool Create( const wxBitmap& bitmap, const wxColour& colour ); -#if wxUSE_PALETTE - bool Create( const wxBitmap& bitmap, int paletteIndex ); -#endif // wxUSE_PALETTE - bool Create( const wxBitmap& bitmap ); - // implementation - GdkBitmap *m_bitmap; +#ifdef __WXGTK3__ + wxMask(cairo_surface_t*); + cairo_surface_t* GetBitmap() const; +#else + wxMask(GdkPixmap*); + GdkPixmap* GetBitmap() const; +#endif - GdkBitmap *GetBitmap() const; +protected: + virtual void FreeData(); + virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour); + virtual bool InitFromMonoBitmap(const wxBitmap& bitmap); private: +#ifdef __WXGTK3__ + cairo_surface_t* m_bitmap; +#else + GdkPixmap* m_bitmap; +#endif + DECLARE_DYNAMIC_CLASS(wxMask) }; @@ -51,46 +65,53 @@ class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: wxBitmap() { } - wxBitmap( int width, int height, int depth = -1 ); + wxBitmap( int width, int height, int depth = wxBITMAP_SCREEN_DEPTH ) + { Create(width, height, depth); } + wxBitmap( const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH ) + { Create(sz, depth); } wxBitmap( const char bits[], int width, int height, int depth = 1 ); wxBitmap( const char* const* bits ); #ifdef wxNEEDS_CHARPP // needed for old GCC wxBitmap(char** data) - { - *this = wxBitmap(wx_const_cast(const char* const*, data)); - } + { *this = wxBitmap(const_cast(data)); } #endif - wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); - wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); } + wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE ); +#if wxUSE_IMAGE + wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH); +#endif // wxUSE_IMAGE + wxBitmap(GdkPixbuf* pixbuf); virtual ~wxBitmap(); - bool Ok() const { return IsOk(); } - bool IsOk() const; - 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); } - int GetHeight() const; - int GetWidth() const; - int GetDepth() const; + virtual int GetHeight() const; + virtual int GetWidth() const; + virtual int GetDepth() const; +#if wxUSE_IMAGE wxImage ConvertToImage() const; +#endif // wxUSE_IMAGE // copies the contents and mask of the given (colour) icon to the bitmap virtual bool CopyFromIcon(const wxIcon& icon); wxMask *GetMask() const; void SetMask( wxMask *mask ); + wxBitmap GetMaskBitmap() const; wxBitmap GetSubBitmap( const wxRect& rect ) const; bool SaveFile(const wxString &name, wxBitmapType type, - const wxPalette *palette = (wxPalette *)NULL) const; - bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_TYPE_XPM ); + const wxPalette *palette = NULL) const; + bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); #if wxUSE_PALETTE wxPalette *GetPalette() const; void SetPalette(const wxPalette& palette); - wxPalette *GetColourMap() const { return GetPalette(); }; + wxPalette *GetColourMap() const { return GetPalette(); } #endif // wxUSE_PALETTE static void InitStandardHandlers(); @@ -101,17 +122,19 @@ public: void SetHeight( int height ); void SetWidth( int width ); void SetDepth( int depth ); - void SetPixmap( GdkPixmap *pixmap ); - void SetPixbuf(GdkPixbuf* pixbuf, int depth = 0); +#ifdef __WXGTK3__ + GdkPixbuf* GetPixbufNoMask() const; + cairo_t* CairoCreate() const; + void Draw(cairo_t* cr, int x, int y, bool useMask = true, const wxColour* fg = NULL, const wxColour* bg = NULL) const; + void SetSourceSurface(cairo_t* cr, int x, int y, const wxColour* fg = NULL, const wxColour* bg = NULL) const; +#else GdkPixmap *GetPixmap() const; bool HasPixmap() const; bool HasPixbuf() const; +#endif GdkPixbuf *GetPixbuf() const; - // Basically, this corresponds to Win32 StretchBlt() - wxBitmap Rescale(int clipx, int clipy, int clipwidth, int clipheight, int width, int height) const; - // raw bitmap access support functions void *GetRawData(wxPixelDataBase& data, int bpp); void UngetRawData(wxPixelDataBase& data); @@ -119,16 +142,26 @@ public: bool HasAlpha() const; protected: +#ifndef __WXGTK3__ +#if wxUSE_IMAGE bool CreateFromImage(const wxImage& image, int depth); +#endif // wxUSE_IMAGE +#endif - virtual wxObjectRefData* CreateRefData() const; - virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const; + virtual wxGDIRefData* CreateGDIRefData() const; + virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const; private: +#ifndef __WXGTK3__ + void SetPixmap(GdkPixmap* pixmap); +#if wxUSE_IMAGE // to be called from CreateFromImage only! bool CreateFromImageAsPixmap(const wxImage& image, int depth); bool CreateFromImageAsPixbuf(const wxImage& image); +#endif // wxUSE_IMAGE +public: + // implementation only enum Representation { Pixmap, @@ -137,21 +170,9 @@ private: // removes other representations from memory, keeping only 'keep' // (wxBitmap may keep same bitmap e.g. as both pixmap and pixbuf): void PurgeOtherRepresentations(Representation keep); +#endif - friend class wxMemoryDC; - friend class wxBitmapHandler; - -private: DECLARE_DYNAMIC_CLASS(wxBitmap) }; -//----------------------------------------------------------------------------- -// wxBitmapHandler -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase -{ - DECLARE_ABSTRACT_CLASS(wxBitmapHandler) -}; - #endif // _WX_GTK_BITMAP_H_