aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Editor.h
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2011-09-09 16:59:38 +1000
committernyamatongwe <devnull@localhost>2011-09-09 16:59:38 +1000
commite00160f45844f28985e11540aa62a96a2fcb0146 (patch)
tree4f4c1f6692ed01d6f6c4f5361935a07328158131 /src/Editor.h
parentec3e2ca261c8a98fd0786c151a737ad12ed637f4 (diff)
parent8ab9f0c333bb0c9ef944d91d940c516b65b0384e (diff)
downloadscintilla-mirror-e00160f45844f28985e11540aa62a96a2fcb0146.tar.gz
Merge with main repository.
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 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());