diff options
| author | nyamatongwe <unknown> | 2011-08-10 23:56:59 +1000 | 
|---|---|---|
| committer | nyamatongwe <unknown> | 2011-08-10 23:56:59 +1000 | 
| commit | 8bf7c53bd47fa32dd162d9db1063545537b1bb5f (patch) | |
| tree | c401b75620e16fa591de3aca73465f7c5d471653 /src/Editor.h | |
| parent | 305b3107ba2abd43e3ed635916c3cad52dc605fe (diff) | |
| download | scintilla-mirror-8bf7c53bd47fa32dd162d9db1063545537b1bb5f.tar.gz | |
Implement 'technology' concept which will allow GDI and Direct2D/DirectWrite
to run at the same time for different windows and operations.
Diffstat (limited to 'src/Editor.h')
| -rw-r--r-- | src/Editor.h | 8 | 
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Editor.h b/src/Editor.h index f1a500b74..7a30fdf3f 100644 --- a/src/Editor.h +++ b/src/Editor.h @@ -131,6 +131,7 @@ 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; @@ -279,7 +280,8 @@ protected:	// ScintillaBase subclass needs access to much of Editor  	void InvalidateStyleRedraw();  	virtual void RefreshColourPalette(Palette &pal, bool want);  	void RefreshStyleData(); -	void DropGraphics(); +	void DropGraphics(bool freeObjects); +	void AllocateGraphics();  	virtual PRectangle GetClientRectangle();  	PRectangle GetTextRectangle(); @@ -574,7 +576,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()); @@ -584,7 +586,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());  | 
