1 files changed, 11 insertions, 11 deletions

diff --git a/scintilla/src/Editor.h b/scintilla/src/Editor.h
index 518ce07..c876868 100644
--- a/scintilla/src/Editor.h
+++ b/scintilla/src/Editor.h
@@ -131,8 +131,8 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	 * When a style attribute is changed, this cache is flushed. */

 	bool stylesValid;

 	ViewStyle vs;

+	int technology;

 	Point sizeRGBAImage;

-	Palette palette;

 

 	int printMagnification;

 	int printColourMode;

@@ -278,9 +278,9 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 

 	void InvalidateStyleData();

 	void InvalidateStyleRedraw();

-	virtual void RefreshColourPalette(Palette &pal, bool want);

 	void RefreshStyleData();

-	void DropGraphics();

+	void DropGraphics(bool freeObjects);

+	void AllocateGraphics();

 

 	virtual PRectangle GetClientRectangle();

 	PRectangle GetTextRectangle();

@@ -368,14 +368,14 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	LineLayout *RetrieveLineLayout(int lineNumber);

 	void LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayout *ll,

 		int width=LineLayout::wrapWidthInfinite);

-	ColourAllocated SelectionBackground(ViewStyle &vsDraw, bool main);

-	ColourAllocated TextBackground(ViewStyle &vsDraw, bool overrideBackground, ColourAllocated background, int inSelection, bool inHotspot, int styleMain, int i, LineLayout *ll);

+	ColourDesired SelectionBackground(ViewStyle &vsDraw, bool main);

+	ColourDesired TextBackground(ViewStyle &vsDraw, bool overrideBackground, ColourDesired background, int inSelection, bool inHotspot, int styleMain, int i, LineLayout *ll);

 	void DrawIndentGuide(Surface *surface, int lineVisible, int lineHeight, int start, PRectangle rcSegment, bool highlight);

-	void DrawWrapMarker(Surface *surface, PRectangle rcPlace, bool isEndMarker, ColourAllocated wrapColour);

+	void DrawWrapMarker(Surface *surface, PRectangle rcPlace, bool isEndMarker, ColourDesired wrapColour);

 	void DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, LineLayout *ll,

 		int line, int lineEnd, int xStart, int subLine, int subLineStart,

-		bool overrideBackground, ColourAllocated background,

-		bool drawWrapMark, ColourAllocated wrapColour);

+		bool overrideBackground, ColourDesired background,

+		bool drawWrapMark, ColourDesired wrapColour);

 	void DrawIndicator(int indicNum, int startPos, int endPos, Surface *surface, ViewStyle &vsDraw,

 		int xStart, PRectangle rcLine, LineLayout *ll, int subLine);

 	void DrawIndicators(Surface *surface, ViewStyle &vsDraw, int line, int xStart,

@@ -385,7 +385,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	void DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVisible, int xStart,

 		PRectangle rcLine, LineLayout *ll, int subLine);

 	void DrawBlockCaret(Surface *surface, ViewStyle &vsDraw, LineLayout *ll, int subLine,

-		int xStart, int offset, int posCaret, PRectangle rcCaret, ColourAllocated caretColour);

+		int xStart, int offset, int posCaret, PRectangle rcCaret, ColourDesired caretColour);

 	void DrawCarets(Surface *surface, ViewStyle &vsDraw, int line, int xStart,

 		PRectangle rcLine, LineLayout *ll, int subLine);

 	void RefreshPixMaps(Surface *surfaceWindow);

@@ -575,7 +575,7 @@ private:
 public:

 	AutoSurface(Editor *ed) : surf(0) {

 		if (ed->wMain.GetID()) {

-			surf = Surface::Allocate();

+			surf = Surface::Allocate(ed->technology);

 			if (surf) {

 				surf->Init(ed->wMain.GetID());

 				surf->SetUnicodeMode(SC_CP_UTF8 == ed->CodePage());

@@ -585,7 +585,7 @@ public:
 	}

 	AutoSurface(SurfaceID sid, Editor *ed) : surf(0) {

 		if (ed->wMain.GetID()) {

-			surf = Surface::Allocate();

+			surf = Surface::Allocate(ed->technology);

 			if (surf) {

 				surf->Init(sid, ed->wMain.GetID());

 				surf->SetUnicodeMode(SC_CP_UTF8 == ed->CodePage());