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

Fix Ok/IsOk() mess in wxGDIObject-derived classes; also added

Browse Source 
wxGDIObject::Create/CloneGDIRefData() and implemented them for (almost) all
ports


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-12-15 17:54:20 +00:00
parent d6906a06a2
commit 8f884a0dcc
161 changed files with 1244 additions and 1139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gtk/bitmap.cpp
View File

@@ -181,12 +181,14 @@ GdkBitmap *wxMask::GetBitmap() const
// wxBitmap
//-----------------------------------------------------------------------------
class wxBitmapRefData: public wxObjectRefData
class wxBitmapRefData: public wxGDIRefData
{
public:
wxBitmapRefData();
virtual ~wxBitmapRefData();
virtual bool IsOk() const { return m_pixmap || m_pixbuf; }
GdkPixmap *m_pixmap;
GdkPixbuf *m_pixbuf;
wxMask *m_mask;
@@ -597,15 +599,6 @@ wxImage wxBitmap::ConvertToImage() const
#endif // wxUSE_IMAGE
bool wxBitmap::IsOk() const
{
return (m_refData != NULL) &&
(
M_BMPDATA->m_pixbuf ||
M_BMPDATA->m_pixmap
);
}
int wxBitmap::GetHeight() const
{
wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
@@ -930,12 +923,12 @@ bool wxBitmap::HasAlpha() const
gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf);
}
wxObjectRefData* wxBitmap::CreateRefData() const
wxGDIRefData* wxBitmap::CreateGDIRefData() const
{
return new wxBitmapRefData;
}
wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const
wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
{
const wxBitmapRefData* oldRef = wx_static_cast(const wxBitmapRefData*, data);
wxBitmapRefData* newRef = new wxBitmapRefData;