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:
@@ -22,12 +22,14 @@
|
||||
// wxCursorRefData
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxCursorRefData: public wxObjectRefData
|
||||
class wxCursorRefData : public wxGDIRefData
|
||||
{
|
||||
public:
|
||||
wxCursorRefData(const wxBitmap& bmp = wxNullBitmap, int id = -1)
|
||||
: m_id(id), m_bitmap(bmp) {}
|
||||
|
||||
virtual bool IsOk() const { return m_bitmap.IsOk(); }
|
||||
|
||||
int m_id;
|
||||
wxBitmap m_bitmap;
|
||||
};
|
||||
@@ -63,17 +65,12 @@ wxCursor::wxCursor(const wxString& cursor_file,
|
||||
#warning "FIXME"
|
||||
}
|
||||
|
||||
bool wxCursor::IsOk() const
|
||||
{
|
||||
return m_refData && M_CURSOR->m_bitmap.Ok();
|
||||
}
|
||||
|
||||
wxObjectRefData *wxCursor::CreateRefData() const
|
||||
wxGDIRefData *wxCursor::CreateGDIRefData() const
|
||||
{
|
||||
return new wxCursorRefData;
|
||||
}
|
||||
|
||||
wxObjectRefData *wxCursor::CloneRefData(const wxObjectRefData *data) const
|
||||
wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const
|
||||
{
|
||||
return new wxCursorRefData(*(wxCursorRefData *)data);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user