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:
@@ -49,7 +49,7 @@ private:
|
||||
// wxRegionRefData: private class containing the information about the region
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class wxRegionRefData : public wxObjectRefData
|
||||
class wxRegionRefData : public wxGDIRefData
|
||||
{
|
||||
public:
|
||||
wxRegionRefData()
|
||||
@@ -58,7 +58,7 @@ public:
|
||||
}
|
||||
|
||||
wxRegionRefData(const wxRegionRefData& refData)
|
||||
: wxObjectRefData()
|
||||
: wxGDIRefData()
|
||||
{
|
||||
m_region = gdk_regions_union(wxGdkRegion(), refData.m_region);
|
||||
}
|
||||
@@ -136,12 +136,12 @@ wxRegion::~wxRegion()
|
||||
// m_refData unrefed in ~wxObject
|
||||
}
|
||||
|
||||
wxObjectRefData *wxRegion::CreateRefData() const
|
||||
wxGDIRefData *wxRegion::CreateGDIRefData() const
|
||||
{
|
||||
return new wxRegionRefData;
|
||||
}
|
||||
|
||||
wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
|
||||
wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const
|
||||
{
|
||||
return new wxRegionRefData(*(wxRegionRefData *)data);
|
||||
}
|
||||
@@ -380,7 +380,7 @@ struct _XRegion {
|
||||
};
|
||||
|
||||
|
||||
class wxRIRefData: public wxObjectRefData
|
||||
class wxRIRefData : public wxGDIRefData
|
||||
{
|
||||
public:
|
||||
wxRIRefData() { Init(); }
|
||||
|
||||
Reference in New Issue
Block a user