diff options
| author | nyamatongwe <devnull@localhost> | 2011-09-09 16:59:38 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2011-09-09 16:59:38 +1000 |
| commit | e00160f45844f28985e11540aa62a96a2fcb0146 (patch) | |
| tree | 4f4c1f6692ed01d6f6c4f5361935a07328158131 /cocoa/PlatCocoa.h | |
| parent | ec3e2ca261c8a98fd0786c151a737ad12ed637f4 (diff) | |
| parent | 8ab9f0c333bb0c9ef944d91d940c516b65b0384e (diff) | |
| download | scintilla-mirror-e00160f45844f28985e11540aa62a96a2fcb0146.tar.gz | |
Merge with main repository.
Diffstat (limited to 'cocoa/PlatCocoa.h')
| -rw-r--r-- | cocoa/PlatCocoa.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cocoa/PlatCocoa.h b/cocoa/PlatCocoa.h index 0e3c5f2e2..7f6a59705 100644 --- a/cocoa/PlatCocoa.h +++ b/cocoa/PlatCocoa.h @@ -96,20 +96,20 @@ public: void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage); void Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back); void Copy(PRectangle rc, Scintilla::Point from, Surface &surfaceSource); - void DrawTextNoClip(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, + void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back); - void DrawTextClipped(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, + void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back); - void DrawTextTransparent(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore); - void MeasureWidths(Font &font_, const char *s, int len, int *positions); - int WidthText(Font &font_, const char *s, int len); - int WidthChar(Font &font_, char ch); - int Ascent(Font &font_); - int Descent(Font &font_); - int InternalLeading(Font &font_); - int ExternalLeading(Font &font_); - int Height(Font &font_); - int AverageCharWidth(Font &font_); + void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourAllocated 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); + XYPOSITION Ascent(Font &font_); + XYPOSITION Descent(Font &font_); + XYPOSITION InternalLeading(Font &font_); + XYPOSITION ExternalLeading(Font &font_); + XYPOSITION Height(Font &font_); + XYPOSITION AverageCharWidth(Font &font_); int SetPalette(Scintilla::Palette *pal, bool inBackGround); void SetClip(PRectangle rc); |