Fix Ok/IsOk() mess in wxGDIObject-derived classes; also added
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:
@@ -46,6 +46,8 @@ public:
|
||||
wxBitmapRefData( const wxBitmapRefData& data );
|
||||
virtual ~wxBitmapRefData();
|
||||
|
||||
virtual bool IsOk() const { return m_ok; }
|
||||
|
||||
protected:
|
||||
int m_width;
|
||||
int m_height;
|
||||
@@ -145,12 +147,12 @@ wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
|
||||
LoadFile(filename, type);
|
||||
}
|
||||
|
||||
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
|
||||
{
|
||||
return new wxBitmapRefData(*(wxBitmapRefData*)data);
|
||||
}
|
||||
@@ -254,11 +256,6 @@ void wxBitmap::SetMask(wxMask *mask)
|
||||
M_BITMAPDATA->m_bitmapMask = mask ;
|
||||
}
|
||||
|
||||
bool wxBitmap::IsOk() const
|
||||
{
|
||||
return m_refData && M_BITMAPDATA->m_ok;
|
||||
}
|
||||
|
||||
wxPalette* wxBitmap::GetPalette() const
|
||||
{
|
||||
if(!m_refData)
|
||||
|
Reference in New Issue
Block a user