AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use common AllocExclusive, rather than custom code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2006-10-17 04:20:47 +00:00
parent e3e89a9370
commit fd7a7443bc
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/gtk/font.h
View File

@ -84,6 +84,9 @@ protected:
// common part of all ctors
void Init();
virtual wxObjectRefData* CreateRefData() const;
virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
private:
DECLARE_DYNAMIC_CLASS(wxFont)
};

45
src/gtk/font.cpp
View File

@ -31,10 +31,7 @@
#include "wx/fontutil.h"
#include "wx/tokenzr.h"
#include <strings.h>
#include "wx/gtk/private.h"
#include <gdk/gdkprivate.h>
// ----------------------------------------------------------------------------
// constants
@ -392,20 +389,6 @@ bool wxFont::Create(const wxString& fontname)
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()
{
}
@ -502,35 +485,35 @@ bool wxFont::IsFixedWidth() const
void wxFont::SetPointSize(int pointSize)
{
Unshare();
AllocExclusive();
M_FONTDATA->SetPointSize(pointSize);
}
void wxFont::SetFamily(int family)
{
Unshare();
AllocExclusive();
M_FONTDATA->SetFamily(family);
}
void wxFont::SetStyle(int style)
{
Unshare();
AllocExclusive();
M_FONTDATA->SetStyle(style);
}
void wxFont::SetWeight(int weight)
{
Unshare();
AllocExclusive();
M_FONTDATA->SetWeight(weight);
}
bool wxFont::SetFaceName(const wxString& faceName)
{
Unshare();
AllocExclusive();
return M_FONTDATA->SetFaceName(faceName) &&
wxFontBase::SetFaceName(faceName);
@ -538,28 +521,38 @@ bool wxFont::SetFaceName(const wxString& faceName)
void wxFont::SetUnderlined(bool underlined)
{
Unshare();
AllocExclusive();
M_FONTDATA->SetUnderlined(underlined);
}
void wxFont::SetEncoding(wxFontEncoding encoding)
{
Unshare();
AllocExclusive();
M_FONTDATA->SetEncoding(encoding);
}
void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
{
Unshare();
AllocExclusive();
M_FONTDATA->SetNativeFontInfo( info );
}
void wxFont::SetNoAntiAliasing( bool no )
{
Unshare();
AllocExclusive();
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));
}