diff options
| author | Neil <nyamatongwe@gmail.com> | 2015-03-29 10:42:33 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2015-03-29 10:42:33 +1100 |
| commit | 121977f613e8d275fd9bdda071d6dc024e16ff78 (patch) | |
| tree | 93dda85d3866fae405510023981911a3c75249c4 | |
| parent | f9ef981fa18225a3e3eb120258fe8919dd37a635 (diff) | |
| download | scintilla-mirror-121977f613e8d275fd9bdda071d6dc024e16ff78.tar.gz | |
Bug [#1682] Removed the ascent member of Font and all wxWidgets-specific code.
| -rw-r--r-- | include/Platform.h | 6 | ||||
| -rw-r--r-- | src/Style.cxx | 3 |
2 files changed, 0 insertions, 9 deletions
diff --git a/include/Platform.h b/include/Platform.h index c4a1a0b40..4ef7e2aab 100644 --- a/include/Platform.h +++ b/include/Platform.h @@ -271,9 +271,6 @@ struct FontParameters { class Font { protected: FontID fid; -#if PLAT_WX - int ascent; -#endif // Private so Font objects can not be copied Font(const Font &); Font &operator=(const Font &); @@ -287,9 +284,6 @@ public: FontID GetID() { return fid; } // Alias another font - caller guarantees not to Release void SetID(FontID fid_) { fid = fid_; } -#if PLAT_WX - void SetAscent(int ascent_) { ascent = ascent_; } -#endif friend class Surface; friend class SurfaceImpl; }; diff --git a/src/Style.cxx b/src/Style.cxx index 10fc0d2bf..ba3f97c3d 100644 --- a/src/Style.cxx +++ b/src/Style.cxx @@ -163,8 +163,5 @@ void Style::ClearTo(const Style &source) { void Style::Copy(Font &font_, const FontMeasurements &fm_) { font.MakeAlias(font_); -#if PLAT_WX - font.SetAscent(fm_.ascent); -#endif (FontMeasurements &)(*this) = fm_; } |