aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Editor.h
diff options
context:
space:
mode:
authornyamatongwe <unknown>2011-09-24 22:10:59 +1000
committernyamatongwe <unknown>2011-09-24 22:10:59 +1000
commit77d25bd25490fe412a213581e371c7c26eb23f7d (patch)
treee91d99a2328e82067e9781599cb2e058a8400fa3 /src/Editor.h
parentdf08d45447c2b2386629d13004f4ab6006cab2d8 (diff)
parent33e27dc25f933a92566d91a667ba4ee732ba6cfa (diff)
downloadscintilla-mirror-77d25bd25490fe412a213581e371c7c26eb23f7d.tar.gz
Merged fractional text positioning branch.
Diffstat (limited to 'src/Editor.h')
-rw-r--r--src/Editor.h8
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());