From 14f8dfdd2dea91c08268b1169b4af4df90e1f7e9 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Wed, 30 Mar 2011 11:46:19 +1100
Subject: Encapsulate the aliasing of Font IDs.

---
 src/Style.cxx | 6 +++++-
 src/Style.h   | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Style.cxx b/src/Style.cxx
index b86884aa5..25efcd6e8 100644
--- a/src/Style.cxx
+++ b/src/Style.cxx
@@ -24,6 +24,10 @@ FontAlias::~FontAlias() {
 	// ~Font will not release the actual font resource sine it is now 0
 }
 
+void FontAlias::MakeAlias(Font &fontOrigin) {
+	SetID(fontOrigin.GetID());
+}
+
 void FontAlias::ClearFont() {
 	SetID(0);
 }
@@ -137,7 +141,7 @@ void Style::ClearTo(const Style &source) {
 }
 
 void Style::Copy(Font &font_, const FontMeasurements &fm_) {
-	font.SetID(font_.GetID());
+	font.MakeAlias(font_);
 	(FontMeasurements &)(*this) = fm_;
 #if PLAT_WX
 	ascent = surface.Ascent(font);
diff --git a/src/Style.h b/src/Style.h
index 460dad490..29122b0a4 100644
--- a/src/Style.h
+++ b/src/Style.h
@@ -38,6 +38,7 @@ class FontAlias : public Font {
 public:
 	FontAlias();
 	virtual ~FontAlias();
+	void MakeAlias(Font &fontOrigin);
 	void ClearFont();
 };
 
-- 
cgit v1.2.3