1 files changed, 19 insertions, 19 deletions
diff --git a/scintilla/src/ViewStyle.h b/scintilla/src/ViewStyle.h
index feaa9eb..a9370c7 100644
--- a/scintilla/src/ViewStyle.h
+++ b/scintilla/src/ViewStyle.h
@@ -48,7 +48,7 @@ public:
 	FontRealised *frNext;
 	FontRealised(const FontSpecification &fs);
 	virtual ~FontRealised();
-	void Realise(Surface &surface, int zoomLevel);
+	void Realise(Surface &surface, int zoomLevel, int technology);
 	FontRealised *Find(const FontSpecification &fs);
 	void FindMaxAscentDescent(unsigned int &maxAscent, unsigned int &maxDescent);
 };
@@ -67,35 +67,36 @@ public:
 	Style *styles;
 	LineMarker markers[MARKER_MAX + 1];
 	Indicator indicators[INDIC_MAX + 1];
+	int technology;
 	int lineHeight;
 	unsigned int maxAscent;
 	unsigned int maxDescent;
 	unsigned int aveCharWidth;
 	unsigned int spaceWidth;
 	bool selforeset;
-	ColourPair selforeground;
-	ColourPair selAdditionalForeground;
+	ColourDesired selforeground;
+	ColourDesired selAdditionalForeground;
 	bool selbackset;
-	ColourPair selbackground;
-	ColourPair selAdditionalBackground;
-	ColourPair selbackground2;
+	ColourDesired selbackground;
+	ColourDesired selAdditionalBackground;
+	ColourDesired selbackground2;
 	int selAlpha;
 	int selAdditionalAlpha;
 	bool selEOLFilled;
 	bool whitespaceForegroundSet;
-	ColourPair whitespaceForeground;
+	ColourDesired whitespaceForeground;
 	bool whitespaceBackgroundSet;
-	ColourPair whitespaceBackground;
-	ColourPair selbar;
-	ColourPair selbarlight;
+	ColourDesired whitespaceBackground;
+	ColourDesired selbar;
+	ColourDesired selbarlight;
 	bool foldmarginColourSet;
-	ColourPair foldmarginColour;
+	ColourDesired foldmarginColour;
 	bool foldmarginHighlightColourSet;
-	ColourPair foldmarginHighlightColour;
+	ColourDesired foldmarginHighlightColour;
 	bool hotspotForegroundSet;
-	ColourPair hotspotForeground;
+	ColourDesired hotspotForeground;
 	bool hotspotBackgroundSet;
-	ColourPair hotspotBackground;
+	ColourDesired hotspotBackground;
 	bool hotspotUnderline;
 	bool hotspotSingleLine;
 	/// Margins are ordered: Line Numbers, Selection Margin, Spacing Margin
@@ -112,12 +113,12 @@ public:
 	IndentView viewIndentationGuides;
 	bool viewEOL;
 	bool showMarkedLines;
-	ColourPair caretcolour;
-	ColourPair additionalCaretColour;
+	ColourDesired caretcolour;
+	ColourDesired additionalCaretColour;
 	bool showCaretLineBackground;
-	ColourPair caretLineBackground;
+	ColourDesired caretLineBackground;
 	int caretLineAlpha;
-	ColourPair edgecolour;
+	ColourDesired edgecolour;
 	int edgeState;
 	int caretStyle;
 	int caretWidth;
@@ -139,7 +140,6 @@ public:
 	~ViewStyle();
 	void Init(size_t stylesSize_=64);
 	void CreateFont(const FontSpecification &fs);
-	void RefreshColourPalette(Palette &pal, bool want);
 	void Refresh(Surface &surface);
 	void AllocStyles(size_t sizeNew);
 	void EnsureStyle(size_t index);