X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d13e22fbfbe631e5ecf037e8afdc9c2cd58418c..465de0be705e52c7f97e9bb6169af9d20a7f72a8:/include/wx/gtk/bitmap.h?ds=sidebyside diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index 8bc0ab3207..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; @@ -30,8 +34,13 @@ public: virtual ~wxMask(); // implementation +#ifdef __WXGTK3__ + wxMask(cairo_surface_t*); + cairo_surface_t* GetBitmap() const; +#else wxMask(GdkPixmap*); GdkPixmap* GetBitmap() const; +#endif protected: virtual void FreeData(); @@ -39,7 +48,11 @@ protected: virtual bool InitFromMonoBitmap(const wxBitmap& bitmap); private: +#ifdef __WXGTK3__ + cairo_surface_t* m_bitmap; +#else GdkPixmap* m_bitmap; +#endif DECLARE_DYNAMIC_CLASS(wxMask) }; @@ -65,9 +78,9 @@ public: #endif wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE ); #if wxUSE_IMAGE - wxBitmap( const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH ) - { (void)CreateFromImage(image, depth); } + wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH); #endif // wxUSE_IMAGE + wxBitmap(GdkPixbuf* pixbuf); virtual ~wxBitmap(); bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); @@ -87,6 +100,7 @@ public: wxMask *GetMask() const; void SetMask( wxMask *mask ); + wxBitmap GetMaskBitmap() const; wxBitmap GetSubBitmap( const wxRect& rect ) const; @@ -108,11 +122,17 @@ public: void SetHeight( int height ); void SetWidth( int width ); void SetDepth( int depth ); - void SetPixbuf(GdkPixbuf* pixbuf); +#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; // raw bitmap access support functions @@ -122,14 +142,17 @@ public: bool HasAlpha() const; protected: +#ifndef __WXGTK3__ #if wxUSE_IMAGE bool CreateFromImage(const wxImage& image, int depth); #endif // wxUSE_IMAGE +#endif 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! @@ -147,6 +170,7 @@ public: // 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 DECLARE_DYNAMIC_CLASS(wxBitmap) };