aboutsummaryrefslogtreecommitdiffhomepage
path: root/cocoa/PlatCocoa.h
diff options
context:
space:
mode:
authornyamatongwe <unknown>2011-09-25 09:50:39 +1000
committernyamatongwe <unknown>2011-09-25 09:50:39 +1000
commit6a7cac4480d15c5737fd5c25a4b0fa3c937d935b (patch)
tree0a95db5373d804a228fe69360c433ce790ed564c /cocoa/PlatCocoa.h
parentb1fc4c2cd37d6ea015a016aa80514de1355b4664 (diff)
downloadscintilla-mirror-6a7cac4480d15c5737fd5c25a4b0fa3c937d935b.tar.gz
Palette support removed.
Diffstat (limited to 'cocoa/PlatCocoa.h')
-rw-r--r--cocoa/PlatCocoa.h31
1 files changed, 15 insertions, 16 deletions
diff --git a/cocoa/PlatCocoa.h b/cocoa/PlatCocoa.h
index 7f6a59705..58017706d 100644
--- a/cocoa/PlatCocoa.h
+++ b/cocoa/PlatCocoa.h
@@ -57,8 +57,8 @@ private:
int bitmapWidth;
int bitmapHeight;
- /** Set the CGContext's fill colour to the specified allocated colour. */
- void FillColour( const ColourAllocated& back );
+ /** Set the CGContext's fill colour to the specified desired colour. */
+ void FillColour( const ColourDesired& back );
// 24-bit RGB+A bitmap data constants
@@ -76,7 +76,7 @@ public:
void Release();
bool Initialised();
- void PenColour(ColourAllocated fore);
+ void PenColour(ColourDesired fore);
/** Returns a CGImageRef that represents the surface. Returns NULL if this is not possible. */
CGImageRef GetImage();
@@ -86,21 +86,21 @@ public:
int DeviceHeightFont(int points);
void MoveTo(int x_, int y_);
void LineTo(int x_, int y_);
- void Polygon(Scintilla::Point *pts, int npts, ColourAllocated fore, ColourAllocated back);
- void RectangleDraw(PRectangle rc, ColourAllocated fore, ColourAllocated back);
- void FillRectangle(PRectangle rc, ColourAllocated back);
+ void Polygon(Scintilla::Point *pts, int npts, ColourDesired fore, ColourDesired back);
+ void RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back);
+ void FillRectangle(PRectangle rc, ColourDesired back);
void FillRectangle(PRectangle rc, Surface &surfacePattern);
- void RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back);
- void AlphaRectangle(PRectangle rc, int cornerSize, ColourAllocated fill, int alphaFill,
- ColourAllocated outline, int alphaOutline, int flags);
+ void RoundedRectangle(PRectangle rc, ColourDesired fore, ColourDesired back);
+ void AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fill, int alphaFill,
+ ColourDesired outline, int alphaOutline, int flags);
void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage);
- void Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back);
+ void Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back);
void Copy(PRectangle rc, Scintilla::Point from, Surface &surfaceSource);
- void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourAllocated fore,
- ColourAllocated back);
- void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourAllocated fore,
- ColourAllocated back);
- void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourAllocated fore);
+ void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore,
+ ColourDesired back);
+ void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore,
+ ColourDesired back);
+ void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore);
void MeasureWidths(Font &font_, const char *s, int len, XYPOSITION *positions);
XYPOSITION WidthText(Font &font_, const char *s, int len);
XYPOSITION WidthChar(Font &font_, char ch);
@@ -111,7 +111,6 @@ public:
XYPOSITION Height(Font &font_);
XYPOSITION AverageCharWidth(Font &font_);
- int SetPalette(Scintilla::Palette *pal, bool inBackGround);
void SetClip(PRectangle rc);
void FlushCachedState();