summaryrefslogtreecommitdiffstats
path: root/scintilla/src/LineMarker.h
diff options
context:
space:
mode:
authorXhmikosR <xhmikosr@users.sourceforge.net>2011-09-25 10:14:59 +0000
committerXhmikosR <xhmikosr@users.sourceforge.net>2011-09-25 10:14:59 +0000
commitc161c121425a63c0f7ef1092d1a22dfdfb3926be (patch)
tree5395c1785ddfd4b008ac2e638ce0e5f3806f01f9 /scintilla/src/LineMarker.h
parent9d9ff1e3c29564e4c0893cedf9364cc20381c3b8 (diff)
downloadnotepad2-mod-c161c121425a63c0f7ef1092d1a22dfdfb3926be.zip
notepad2-mod-c161c121425a63c0f7ef1092d1a22dfdfb3926be.tar.gz
notepad2-mod-c161c121425a63c0f7ef1092d1a22dfdfb3926be.tar.bz2
update Scintilla
git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@576 28bd50df-7adb-d945-0439-6e466c6a13cc
Diffstat (limited to 'scintilla/src/LineMarker.h')
-rw-r--r--scintilla/src/LineMarker.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/scintilla/src/LineMarker.h b/scintilla/src/LineMarker.h
index 2e28090..8607959 100644
--- a/scintilla/src/LineMarker.h
+++ b/scintilla/src/LineMarker.h
@@ -20,9 +20,9 @@ public:
enum typeOfFold { undefined, head, body, tail, headWithTail };
int markType;
- ColourPair fore;
- ColourPair back;
- ColourPair backSelected;
+ ColourDesired fore;
+ ColourDesired back;
+ ColourDesired backSelected;
int alpha;
XPM *pxpm;
RGBAImage *image;
@@ -62,7 +62,6 @@ public:
image = NULL;
return *this;
}
- void RefreshColourPalette(Palette &pal, bool want);
void SetXPM(const char *textForm);
void SetXPM(const char *const *linesForm);
void SetRGBAImage(Point sizeRGBAImage, const unsigned char *pixelsRGBAImage);