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

derive wxMask from wxMaskBase

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-10-17 20:06:34 +00:00
parent 8478ed64d7
commit 60a3d1c65b
2 changed files with 14 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@ class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
// wxMask
//-----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxMask: public wxObject
class WXDLLIMPEXP_CORE wxMask: public wxMaskBase
{
public:
wxMask();
@@ -28,18 +28,15 @@ 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;
GdkBitmap *GetBitmap() const;
private:
protected:
virtual void FreeData();
virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour);
virtual bool InitFromMonoBitmap(const wxBitmap& bitmap);
DECLARE_DYNAMIC_CLASS(wxMask)
};