aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ViewStyle.h
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2011-03-30 11:45:46 +1100
committernyamatongwe <devnull@localhost>2011-03-30 11:45:46 +1100
commit19c81d8b5587ea4ee147f86c614575cffcf8b4cb (patch)
treeafa66f7fbbe7ca5a0dff614339417c69ab1976b7 /src/ViewStyle.h
parent203b4ab06fb7b7a3e1b32fa72dc200e2298275a1 (diff)
downloadscintilla-mirror-19c81d8b5587ea4ee147f86c614575cffcf8b4cb.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.h3
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();