use common AllocExclusive, rather than custom code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -84,6 +84,9 @@ protected:
|
|||||||
// common part of all ctors
|
// common part of all ctors
|
||||||
void Init();
|
void Init();
|
||||||
|
|
||||||
|
virtual wxObjectRefData* CreateRefData() const;
|
||||||
|
virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
DECLARE_DYNAMIC_CLASS(wxFont)
|
DECLARE_DYNAMIC_CLASS(wxFont)
|
||||||
};
|
};
|
||||||
|
@@ -31,10 +31,7 @@
|
|||||||
#include "wx/fontutil.h"
|
#include "wx/fontutil.h"
|
||||||
#include "wx/tokenzr.h"
|
#include "wx/tokenzr.h"
|
||||||
|
|
||||||
#include <strings.h>
|
|
||||||
|
|
||||||
#include "wx/gtk/private.h"
|
#include "wx/gtk/private.h"
|
||||||
#include <gdk/gdkprivate.h>
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// constants
|
// constants
|
||||||
@@ -392,20 +389,6 @@ bool wxFont::Create(const wxString& fontname)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxFont::Unshare()
|
|
||||||
{
|
|
||||||
if (!m_refData)
|
|
||||||
{
|
|
||||||
m_refData = new wxFontRefData();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
|
|
||||||
UnRef();
|
|
||||||
m_refData = ref;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
wxFont::~wxFont()
|
wxFont::~wxFont()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -502,35 +485,35 @@ bool wxFont::IsFixedWidth() const
|
|||||||
|
|
||||||
void wxFont::SetPointSize(int pointSize)
|
void wxFont::SetPointSize(int pointSize)
|
||||||
{
|
{
|
||||||
Unshare();
|
AllocExclusive();
|
||||||
|
|
||||||
M_FONTDATA->SetPointSize(pointSize);
|
M_FONTDATA->SetPointSize(pointSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxFont::SetFamily(int family)
|
void wxFont::SetFamily(int family)
|
||||||
{
|
{
|
||||||
Unshare();
|
AllocExclusive();
|
||||||
|
|
||||||
M_FONTDATA->SetFamily(family);
|
M_FONTDATA->SetFamily(family);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxFont::SetStyle(int style)
|
void wxFont::SetStyle(int style)
|
||||||
{
|
{
|
||||||
Unshare();
|
AllocExclusive();
|
||||||
|
|
||||||
M_FONTDATA->SetStyle(style);
|
M_FONTDATA->SetStyle(style);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxFont::SetWeight(int weight)
|
void wxFont::SetWeight(int weight)
|
||||||
{
|
{
|
||||||
Unshare();
|
AllocExclusive();
|
||||||
|
|
||||||
M_FONTDATA->SetWeight(weight);
|
M_FONTDATA->SetWeight(weight);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxFont::SetFaceName(const wxString& faceName)
|
bool wxFont::SetFaceName(const wxString& faceName)
|
||||||
{
|
{
|
||||||
Unshare();
|
AllocExclusive();
|
||||||
|
|
||||||
return M_FONTDATA->SetFaceName(faceName) &&
|
return M_FONTDATA->SetFaceName(faceName) &&
|
||||||
wxFontBase::SetFaceName(faceName);
|
wxFontBase::SetFaceName(faceName);
|
||||||
@@ -538,28 +521,38 @@ bool wxFont::SetFaceName(const wxString& faceName)
|
|||||||
|
|
||||||
void wxFont::SetUnderlined(bool underlined)
|
void wxFont::SetUnderlined(bool underlined)
|
||||||
{
|
{
|
||||||
Unshare();
|
AllocExclusive();
|
||||||
|
|
||||||
M_FONTDATA->SetUnderlined(underlined);
|
M_FONTDATA->SetUnderlined(underlined);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxFont::SetEncoding(wxFontEncoding encoding)
|
void wxFont::SetEncoding(wxFontEncoding encoding)
|
||||||
{
|
{
|
||||||
Unshare();
|
AllocExclusive();
|
||||||
|
|
||||||
M_FONTDATA->SetEncoding(encoding);
|
M_FONTDATA->SetEncoding(encoding);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
|
void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
|
||||||
{
|
{
|
||||||
Unshare();
|
AllocExclusive();
|
||||||
|
|
||||||
M_FONTDATA->SetNativeFontInfo( info );
|
M_FONTDATA->SetNativeFontInfo( info );
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxFont::SetNoAntiAliasing( bool no )
|
void wxFont::SetNoAntiAliasing( bool no )
|
||||||
{
|
{
|
||||||
Unshare();
|
AllocExclusive();
|
||||||
|
|
||||||
M_FONTDATA->SetNoAntiAliasing( no );
|
M_FONTDATA->SetNoAntiAliasing( no );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxObjectRefData* wxFont::CreateRefData() const
|
||||||
|
{
|
||||||
|
return new wxFontRefData;
|
||||||
|
}
|
||||||
|
|
||||||
|
wxObjectRefData* wxFont::CloneRefData(const wxObjectRefData* data) const
|
||||||
|
{
|
||||||
|
return new wxFontRefData(*wx_static_cast(const wxFontRefData*, data));
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user