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

34
src/gtk/bitmap.cpp
View File

@@ -37,7 +37,7 @@ extern GtkWidget *wxGetRootWindow();
// wxMask
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxMask, wxMaskBase)
wxMask::wxMask()
{
@@ -47,7 +47,7 @@ wxMask::wxMask()
wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
{
m_bitmap = NULL;
Create( bitmap, colour );
InitFromColour(bitmap, colour);
}
#if wxUSE_PALETTE
@@ -61,7 +61,7 @@ wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
wxMask::wxMask( const wxBitmap& bitmap )
{
m_bitmap = NULL;
Create( bitmap );
InitFromMonoBitmap(bitmap);
}
wxMask::~wxMask()
@@ -70,15 +70,17 @@ wxMask::~wxMask()
g_object_unref (m_bitmap);
}
bool wxMask::Create( const wxBitmap& bitmap,
const wxColour& colour )
void wxMask::FreeData()
{
if (m_bitmap)
{
g_object_unref (m_bitmap);
m_bitmap = NULL;
}
}
bool wxMask::InitFromColour(const wxBitmap& bitmap, const wxColour& colour)
{
const int w = bitmap.GetWidth();
const int h = bitmap.GetHeight();
@@ -136,28 +138,8 @@ bool wxMask::Create( const wxBitmap& bitmap,
return true;
}
#if wxUSE_PALETTE
bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex )
bool wxMask::InitFromMonoBitmap(const wxBitmap& bitmap)
{
unsigned char r,g,b;
wxPalette *pal = bitmap.GetPalette();
wxCHECK_MSG( pal, false, wxT("Cannot create mask from bitmap without palette") );
pal->GetRGB(paletteIndex, &r, &g, &b);
return Create(bitmap, wxColour(r, g, b));
}
#endif // wxUSE_PALETTE
bool wxMask::Create( const wxBitmap& bitmap )
{
if (m_bitmap)
{
g_object_unref (m_bitmap);
m_bitmap = NULL;
}
if (!bitmap.IsOk()) return false;
wxCHECK_MSG( bitmap.GetDepth() == 1, false, wxT("Cannot create mask from colour bitmap") );