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

added wxBitmap::CopyFromIcon to wxGTK

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-09-23 22:36:17 +00:00
parent fb1a41cd75
commit db0aec831d
4 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,6 +84,9 @@ public:
wxImage ConvertToImage() const; wxImage ConvertToImage() const;
// copies the contents and mask of the given (colour) icon to the bitmap
virtual bool CopyFromIcon(const wxIcon& icon);
wxMask *GetMask() const; wxMask *GetMask() const;
void SetMask( wxMask *mask ); void SetMask( wxMask *mask );

3
include/wx/gtk1/bitmap.h
View File

@@ -84,6 +84,9 @@ public:
wxImage ConvertToImage() const; wxImage ConvertToImage() const;
// copies the contents and mask of the given (colour) icon to the bitmap
virtual bool CopyFromIcon(const wxIcon& icon);
wxMask *GetMask() const; wxMask *GetMask() const;
void SetMask( wxMask *mask ); void SetMask( wxMask *mask );

6
src/gtk/bitmap.cpp
View File

@@ -865,6 +865,12 @@ void wxBitmap::SetMask( wxMask *mask )
M_BMPDATA->m_mask = mask; M_BMPDATA->m_mask = mask;
} }
bool wxBitmap::CopyFromIcon(const wxIcon& icon)
{
*this = icon;
return TRUE;
}
wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
{ {
wxCHECK_MSG( Ok() && wxCHECK_MSG( Ok() &&

6
src/gtk1/bitmap.cpp
View File

@@ -865,6 +865,12 @@ void wxBitmap::SetMask( wxMask *mask )
M_BMPDATA->m_mask = mask; M_BMPDATA->m_mask = mask;
} }
bool wxBitmap::CopyFromIcon(const wxIcon& icon)
{
*this = icon;
return TRUE;
}
wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
{ {
wxCHECK_MSG( Ok() && wxCHECK_MSG( Ok() &&