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).

1 files changed, 2 insertions, 4 deletions

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);