diff options
author | nyamatongwe <unknown> | 2011-03-30 11:45:46 +1100 |
---|---|---|
committer | nyamatongwe <unknown> | 2011-03-30 11:45:46 +1100 |
commit | 56eba2f34946b226dc4734298b85cc30bcb834fe (patch) | |
tree | 31861f8774e40da929410c65584d8c707f32fd44 /src/ViewStyle.h | |
parent | 48028319f42e97ade19f187e909d2d1ed2807e56 (diff) | |
download | scintilla-mirror-56eba2f34946b226dc4734298b85cc30bcb834fe.tar.gz |
Avoid clash with field 'ascent' between FontMeasurements and PLAT_WX
version of Font.
Diffstat (limited to 'src/ViewStyle.h')
-rw-r--r-- | src/ViewStyle.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ViewStyle.h b/src/ViewStyle.h index cf45be41f..74efa6abd 100644 --- a/src/ViewStyle.h +++ b/src/ViewStyle.h @@ -39,11 +39,12 @@ public: const char *Save(const char *name); }; -class FontRealised : public Font, public FontSpecification, public FontMeasurements { +class FontRealised : public FontSpecification, public FontMeasurements { // Private so FontRealised objects can not be copied FontRealised(const FontRealised &); FontRealised &operator=(const FontRealised &); public: + Font font; FontRealised *frNext; FontRealised(const FontSpecification &fs); virtual ~FontRealised(); |