diff options
| author | nyamatongwe <devnull@localhost> | 2011-08-10 23:56:59 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2011-08-10 23:56:59 +1000 |
| commit | 6860b289d19541ccb8d5be31c81c0f1aa992e9d7 (patch) | |
| tree | a956b90c8d42a4f6041dce7251007f0b7e8e12d7 /src/Editor.h | |
| parent | 4b3344ecf4e02df4ad1530e4b46d477457d73f95 (diff) | |
| download | scintilla-mirror-6860b289d19541ccb8d5be31c81c0f1aa992e9d7.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()); |