Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add wxMask::GetBitmap(), closes #9381

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2013-01-20 06:28:11 +00:00
parent 3e118784c7
commit 5ca21fe7bf
13 changed files with 95 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/gtk/bitmap.h
View File

@@ -32,14 +32,15 @@ public:
#endif // wxUSE_PALETTE
wxMask( const wxBitmap& bitmap );
virtual ~wxMask();
wxBitmap GetBitmap() const;
// implementation
#ifdef __WXGTK3__
wxMask(cairo_surface_t*);
cairo_surface_t* GetBitmap() const;
operator cairo_surface_t*() const;
#else
wxMask(GdkPixmap*);
GdkPixmap* GetBitmap() const;
operator GdkPixmap*() const;
#endif
protected:
@@ -80,7 +81,7 @@ public:
#if wxUSE_IMAGE
wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH);
#endif // wxUSE_IMAGE
wxBitmap(GdkPixbuf* pixbuf);
wxBitmap(GdkPixbuf* pixbuf, int depth = 0);
virtual ~wxBitmap();
bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
@@ -132,6 +133,7 @@ public:
GdkPixmap *GetPixmap() const;
bool HasPixmap() const;
bool HasPixbuf() const;
wxBitmap(GdkPixmap* pixmap);
#endif
GdkPixbuf *GetPixbuf() const;