From ffa2c5b99b0eb534498a550d11ac5debc1204c32 Mon Sep 17 00:00:00 2001 From: mixedpuppy Date: Wed, 5 Dec 2007 23:06:58 +0000 Subject: modified version of adobe OSX patches. Most of these patches are provided by Adobe, though I've reorganized a lot of them - improved drag/drop - make copy/paste use modern pasteboard api's - optimized textlayout usage - reduce assertions for debug builds - implement IME support - other minor things patches are available in openkomodo, which is a good test ground for scintilla osx (until someone ports SCiTE). --- macosx/PlatMacOSX.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'macosx/PlatMacOSX.h') diff --git a/macosx/PlatMacOSX.h b/macosx/PlatMacOSX.h index 168ba74ee..58e1bc6d7 100644 --- a/macosx/PlatMacOSX.h +++ b/macosx/PlatMacOSX.h @@ -23,12 +23,11 @@ private: float x; float y; -#ifdef SUPPORT_PORT - CGrafPtr port; -#endif CGContextRef gc; + /** The text layout instance */ + QuartzTextLayout* textLayout; /** If the surface is a bitmap context, contains a reference to the bitmap data. */ uint8_t* bitmapData; /** If the surface is a bitmap context, stores the dimensions of the bitmap. */ @@ -74,7 +73,6 @@ public: void Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back); void Copy(PRectangle rc, Scintilla::Point from, Surface &surfaceSource); - QuartzTextLayout* GetTextLayout( Font &font_, const char *s, int len ); void DrawTextNoClip(PRectangle rc, Font &font_, int 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, ColourAllocated back); void DrawTextTransparent(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore); -- cgit v1.2.3