diff options
| author | nyamatongwe <devnull@localhost> | 2011-09-24 22:10:59 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2011-09-24 22:10:59 +1000 |
| commit | 13c4176ea8389b4fc11fed3e87f4e5439c57443f (patch) | |
| tree | becbb686e7e24d5a4006eea0cf3500cf943fd807 /src/Editor.h | |
| parent | 70c8f32c4482e04bacae5d4712a34a2df2ddf209 (diff) | |
| parent | d214500ee10fe9830cdc36d0b039d49ef86e26de (diff) | |
| download | scintilla-mirror-13c4176ea8389b4fc11fed3e87f4e5439c57443f.tar.gz | |
Merged fractional text positioning branch.
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 cd5695c09..06b905961 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; @@ -280,7 +281,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(); @@ -575,7 +577,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 +587,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()); |