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

14
src/gtk1/font.cpp
View File

@@ -54,7 +54,7 @@ WX_DECLARE_HASH_MAP(int, GdkFont *, wxIntegerHash, wxIntegerEqual,
// wxFontRefData
// ----------------------------------------------------------------------------
class wxFontRefData : public wxObjectRefData
class wxFontRefData : public wxGDIRefData
{
public:
// from broken down font parameters, also default ctor
@@ -291,7 +291,7 @@ void wxFontRefData::InitFromNative()
}
wxFontRefData::wxFontRefData( const wxFontRefData& data )
: wxObjectRefData()
: wxGDIRefData()
{
m_pointSize = data.m_pointSize;
m_family = data.m_family;
@@ -536,6 +536,16 @@ wxFont::~wxFont()
{
}
wxGDIRefData *wxFont::CreateGDIRefData() const
{
return new wxFontRefData;
}
wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
{
return new wxFontRefData(*wx_static_cast(const wxFontRefData *, data));
}
// ----------------------------------------------------------------------------
// accessors
// ----------------------------------------------------------------------------