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:
Vadim Zeitlin
2007-12-15 17:54:20 +00:00
parent d6906a06a2
commit 8f884a0dcc
161 changed files with 1244 additions and 1139 deletions

View File

@@ -246,7 +246,7 @@ static DFBSurfacePixelFormat DepthToFormat(int depth)
// wxBitmapRefData
//-----------------------------------------------------------------------------
class wxBitmapRefData: public wxObjectRefData
class wxBitmapRefData: public wxGDIRefData
{
public:
wxBitmapRefData()
@@ -275,6 +275,8 @@ public:
#endif
}
virtual bool IsOk() const { return m_surface; }
wxIDirectFBSurfacePtr m_surface;
wxMask *m_mask;
#if wxUSE_PALETTE
@@ -458,11 +460,6 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
wxFAIL_MSG( "not implemented" );
}
bool wxBitmap::IsOk() const
{
return (m_refData != NULL && M_BITMAP->m_surface);
}
int wxBitmap::GetHeight() const
{
wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
@@ -644,12 +641,12 @@ wxIDirectFBSurfacePtr wxBitmap::GetDirectFBSurface() const
return M_BITMAP->m_surface;
}
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);
}