diff options
| author | nyamatongwe <unknown> | 2011-03-30 11:46:19 +1100 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2011-03-30 11:46:19 +1100 |
| commit | 14f8dfdd2dea91c08268b1169b4af4df90e1f7e9 (patch) | |
| tree | 4d12539b9fef39b1aa0b3ef4f4024c786ae2e486 | |
| parent | 56eba2f34946b226dc4734298b85cc30bcb834fe (diff) | |
| download | scintilla-mirror-14f8dfdd2dea91c08268b1169b4af4df90e1f7e9.tar.gz | |
Encapsulate the aliasing of Font IDs.
| -rw-r--r-- | src/Style.cxx | 6 | ||||
| -rw-r--r-- | src/Style.h | 1 |
2 files changed, 6 insertions, 1 deletions
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(); }; |