Updated cocoa to current version from bzr.

author: nyamatongwe <devnull@localhost> 2009-06-26 06:22:21 +0000
committer: nyamatongwe <devnull@localhost> 2009-06-26 06:22:21 +0000
commit: 20bf88ac8226b48883f744cc702926454f142d64 (patch)
tree: e8a7eb028667153470731d0e51c03e6e5f6e7c1f
parent: 2f3029c7c2344fa0d950be945dd686b7cfc617c9 (diff)
download: scintilla-mirror-20bf88ac8226b48883f744cc702926454f142d64.tar.gz
8 files changed, 411 insertions, 771 deletions
diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm
index ca24c4b47..49be5ed69 100644
--- a/cocoa/PlatCocoa.mm
+++ b/cocoa/PlatCocoa.mm
@@ -12,6 +12,8 @@
  * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
  */
 
+#import <ScintillaView.h>
+
 #include "PlatCocoa.h"
 
 #include <cstring>
@@ -25,8 +27,6 @@
 
 #import <Foundation/NSGeometry.h>
 
-#import <ScintillaView.h>
-
 #import <Carbon/Carbon.h> // Temporary
 
 using namespace Scintilla;
@@ -221,7 +221,6 @@ void SurfaceImpl::Release()
   bitmapHeight = 0;
   x = 0;
   y = 0;
-  //inited = false;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1955,6 +1954,8 @@ unsigned int Platform::DoubleClickTime()
 {
   float threshold = [[NSUserDefaults standardUserDefaults] floatForKey: 
                      @"com.apple.mouse.doubleClickThreshold"];
+  if (threshold == 0)
+    threshold = 0.5;
   return static_cast<unsigned int>(threshold / kEventDurationMillisecond);
 }
 
@@ -1967,29 +1968,6 @@ bool Platform::MouseButtonBounce()
 
 //--------------------------------------------------------------------------------------------------
 
-bool Platform::IsKeyDown(int keyCode)
-{
-  return false;
-  // TODO: Map Scintilla/Windows key codes to Mac OS X key codes
-  // TODO: Do I need this?
-  /*
-   // Inspired by code at: http://www.sover.net/~jams/Morgan/docs/GameInputMethods.txt
-   
-   // Get the keys
-   KeyMap keys;
-   GetKeys( keys );
-   
-   // Calculate the key map index
-   long keyMapIndex = keys[keyCode/8];
-   // Calculate the individual bit to check
-   short bitToCheck = keyCode % 8;
-   // Check the status of the key
-   return ( keyMapIndex >> bitToCheck ) & 0x01;
-   */
-}
-
-//--------------------------------------------------------------------------------------------------
-
 /**
  * Helper method for the backend to reach through to the scintiall window.
  */
diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
index 2fa2f1bfe..383952304 100644
--- a/cocoa/ScintillaCocoa.h
+++ b/cocoa/ScintillaCocoa.h
@@ -3,7 +3,7 @@
  *
  * Mike Lischke <mlischke@sun.com>
  *
- * Based on ScintillaCocoa.h
+ * Based on ScintillaMacOSX.h
  * Original code by Evan Jones on Sun Sep 01 2002.
  *  Contributors:
  *  Shane Caraveo, ActiveState
@@ -19,16 +19,13 @@
 #include <ctype.h>
 #include <time.h>
 
-#include "Platform.h"
-#include "Scintilla.h"
-#include "PlatCocoa.h"
-
 #ifdef SCI_LEXER
 #include "SciLexer.h"
 #include "PropSet.h"
 #include "Accessor.h"
 #include "KeyWords.h"
 #endif
+
 #include "SVector.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
@@ -49,12 +46,11 @@
 #include "PositionCache.h"
 #include "Editor.h"
 #include "SString.h"
-#include "ScintillaBase.h"
 //#include "ScintillaCallTip.h"
 
-#import <Cocoa/Cocoa.h>
+#include "ScintillaBase.h"
 
-#import <Carbon/Carbon.h> // Temporary
+extern "C" NSString* ScintillaRecPboardType;
 
 @class ScintillaView;
 
@@ -141,14 +137,13 @@ public:
   bool SetIdle(bool on);
   void SetMouseCapture(bool on);
   bool HaveMouseCapture();
-//    virtual void ScrollText(int linesToMove);
   void SetVerticalScrollPos();
   void SetHorizontalScrollPos();
   bool ModifyScrollBars(int nMax, int nPage);
   void Resize();
   void DoScroll(float position, NSScrollerPart part, bool horizontal);
     
-  // Notifications.
+  // Notifications for the owner.
   void NotifyChange();
   void NotifyFocus(bool focus);
   void NotifyParent(SCNotification scn);
@@ -166,6 +161,8 @@ public:
   virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
   virtual void ClaimSelection();
 
+  NSPoint GetCaretPosition();
+  
   static sptr_t DirectFunction(ScintillaCocoa *sciThis, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
 
   void TimerFired(NSTimer* timer);
@@ -189,6 +186,13 @@ public:
   bool PerformDragOperation(id <NSDraggingInfo> info);
   void DragScroll();
   
+  // Promote some methods needed for NSResponder actions.
+  virtual void SelectAll();
+  void DeleteBackward();
+  virtual void Cut();
+  virtual void Undo();
+  virtual void Redo();
+  
   //    virtual OSStatus ContextualMenuClick( HIPoint& location );
 //
 //    virtual OSStatus ActiveStateChanged();
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index b0456a53d..13c214207 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -14,10 +14,12 @@
  * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
  */
 
-#include "ScintillaCocoa.h"
-#include "ScintillaView.h"
+#import <Cocoa/Cocoa.h>
+
+#import <Carbon/Carbon.h> // Temporary
 
-#include <Carbon/Carbon.h> // Temporary
+#include "ScintillaView.h"
+#include "PlatCocoa.h"
 
 using namespace Scintilla;
 
@@ -636,6 +638,21 @@ void ScintillaCocoa::ClaimSelection()
 
 // -------------------------------------------------------------------------------------------------
 
+/**
+ * Returns the current caret position (which is tracked as an offset into the entire text string)
+ * to a row:column pair. The result is zero-based.
+ */
+NSPoint ScintillaCocoa::GetCaretPosition()
+{
+  NSPoint result;
+
+  result.y = pdoc->LineFromPosition(currentPos);
+  result.x = currentPos - pdoc->LineStart(result.y);
+  return result;
+}
+
+// -------------------------------------------------------------------------------------------------
+
 #pragma segment Drag
 
 /**
@@ -908,7 +925,7 @@ bool ScintillaCocoa::GetPasteboardData(NSPasteboard* board, SelectionText* selec
     {
       char* text = (char*) [data UTF8String];
       bool rectangular = bestType == ScintillaRecPboardType;
-      selectedText->Copy(text, strlen(text) + 1, 0, 0, rectangular, false);
+      selectedText->Copy(text, strlen(text), 0, 0, rectangular, false);
     }
     return true;
   }
@@ -979,7 +996,7 @@ void ScintillaCocoa::SetVerticalScrollPos()
 {
   ScintillaView* topContainer = TopContainer();
   
-  // Convert absolute coordinate into the range [0..1]. Keep in mind that the visibile area
+  // Convert absolute coordinate into the range [0..1]. Keep in mind that the visible area
   // does *not* belong to the scroll range.
   float relativePosition = (float) topLine / MaxScrollPos();
   [topContainer setVerticalScrollPosition: relativePosition];
@@ -992,7 +1009,7 @@ void ScintillaCocoa::SetHorizontalScrollPos()
   ScintillaView* topContainer = TopContainer();
   PRectangle textRect = GetTextRectangle();
   
-  // Convert absolute coordinate into the range [0..1]. Keep in mind that the visibile area
+  // Convert absolute coordinate into the range [0..1]. Keep in mind that the visible area
   // does *not* belong to the scroll range.
   float relativePosition = (float) xOffset / (scrollWidth - textRect.Width());
   [topContainer setHorizontalScrollPosition: relativePosition];
@@ -1015,12 +1032,20 @@ bool ScintillaCocoa::ModifyScrollBars(int nMax, int nPage)
   NSRect bounds = [container frame];
   ScintillaView* topContainer = TopContainer();
 
+  // Set page size to the same value as the scroll range to hide the scrollbar.
   int scrollRange = lineHeight * (nMax + 1); // +1 because the caller subtracted one.
-  int pageSize = bounds.size.height;
+  int pageSize;
+  if (verticalScrollBarVisible)
+    pageSize = bounds.size.height;
+  else
+    pageSize = scrollRange;
   bool verticalChange = [topContainer setVerticalScrollRange: scrollRange page: pageSize];
   
   scrollRange = scrollWidth;
-  pageSize = bounds.size.width;
+  if (horizontalScrollBarVisible)
+    pageSize = bounds.size.width;
+  else
+    pageSize = scrollRange;
   bool horizontalChange = [topContainer setHorizontalScrollRange: scrollRange page: pageSize];
   
   return verticalChange || horizontalChange;
@@ -1349,6 +1374,7 @@ void ScintillaCocoa::MouseDown(NSEvent* event)
 void ScintillaCocoa::MouseMove(NSEvent* event)
 {
   lastMouseEvent = event;
+  
   ButtonMove(ConvertPoint([event locationInWindow]));
 }
 
@@ -1368,7 +1394,6 @@ void ScintillaCocoa::MouseWheel(NSEvent* event)
 {
   bool command = ([event modifierFlags] & NSCommandKeyMask) != 0;
   bool shift = ([event modifierFlags] & NSShiftKeyMask) != 0;
-  int lineHeight = WndProc(SCI_TEXTHEIGHT, 0, 0);
   int delta;
   if (shift)
     delta = 10 * [event deltaX]; // Arbitrary scale factor.
@@ -1400,6 +1425,35 @@ void ScintillaCocoa::MouseWheel(NSEvent* event)
 
 //--------------------------------------------------------------------------------------------------
 
+// Helper methods for NSResponder actions.
+
+void ScintillaCocoa::SelectAll()
+{
+  Editor::SelectAll();
+}
+
+void ScintillaCocoa::DeleteBackward()
+{
+  KeyDown(SCK_BACK, false, false, false, nil);
+}
+
+void ScintillaCocoa::Cut()
+{
+  Editor::Cut();
+}
+
+void ScintillaCocoa::Undo()
+{
+  Editor::Undo();
+}
+
+void ScintillaCocoa::Redo()
+{
+  Editor::Undo();
+}
+
+//--------------------------------------------------------------------------------------------------
+
 //OSStatus ScintillaCocoa::ContextualMenuClick( HIPoint& location )
 //{
 //  // convert screen coords to window relative
diff --git a/cocoa/ScintillaTest/AppController.h b/cocoa/ScintillaTest/AppController.h
index 034755fd6..7c4f029e5 100644
--- a/cocoa/ScintillaTest/AppController.h
+++ b/cocoa/ScintillaTest/AppController.h
@@ -8,7 +8,12 @@
  */
 
 #import <Cocoa/Cocoa.h>
+
+#define SCI_LEXER
+#define SCI_NAMESPACE
+
 #import "ScintillaView.h"
+#import "InfoBar.h"
 
 @interface AppController : NSObject {
   IBOutlet NSBox *mEditHost;
diff --git a/cocoa/ScintillaTest/AppController.mm b/cocoa/ScintillaTest/AppController.mm
index 37fe8c8e1..d660e0f75 100644
--- a/cocoa/ScintillaTest/AppController.mm
+++ b/cocoa/ScintillaTest/AppController.mm
@@ -8,11 +8,6 @@
  */
 
 #import "AppController.h"
-#import "ScintillaView.h"
-
-#include "Scintilla.h"
-
-using namespace Scintilla;
 
 const char major_keywords[] =
   "accessible add all alter analyze and as asc asensitive "
@@ -207,6 +202,11 @@ const char user_keywords[] = // Definition of own keywords, not used by MySQL.
   
   // Uncomment if you wanna see auto wrapping in action.
   //[mEditor setGeneralProperty: SCI_SETWRAPMODE parameter: SC_WRAP_WORD value: 0];
+  
+  InfoBar* infoBar = [[[InfoBar alloc] initWithFrame: NSMakeRect(0, 0, 400, 0)] autorelease];
+  [infoBar setDisplay: IBShowAll];
+  [mEditor setInfoBar: infoBar top: NO];
+  [mEditor setStatusText: @"Operation complete"];
 }
 
 @end
diff --git a/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj b/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj
index a7665e81f..25aabb608 100644
--- a/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj
+++ b/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj
@@ -8,130 +8,28 @@
 
 /* Begin PBXBuildFile section */
 		1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
-		271D1F9D0FA7236900FD601F /* LexAbaqus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F580FA7236900FD601F /* LexAbaqus.cxx */; };
-		271D1F9E0FA7236900FD601F /* LexAda.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F590FA7236900FD601F /* LexAda.cxx */; };
-		271D1F9F0FA7236900FD601F /* LexAPDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F5A0FA7236900FD601F /* LexAPDL.cxx */; };
-		271D1FA00FA7236900FD601F /* LexAsm.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F5B0FA7236900FD601F /* LexAsm.cxx */; };
-		271D1FA10FA7236900FD601F /* LexAsn1.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F5C0FA7236900FD601F /* LexAsn1.cxx */; };
-		271D1FA20FA7236900FD601F /* LexASY.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F5D0FA7236900FD601F /* LexASY.cxx */; };
-		271D1FA30FA7236900FD601F /* LexAU3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F5E0FA7236900FD601F /* LexAU3.cxx */; };
-		271D1FA40FA7236900FD601F /* LexAVE.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F5F0FA7236900FD601F /* LexAVE.cxx */; };
-		271D1FA50FA7236900FD601F /* LexBaan.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F600FA7236900FD601F /* LexBaan.cxx */; };
-		271D1FA60FA7236900FD601F /* LexBasic.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F610FA7236900FD601F /* LexBasic.cxx */; };
-		271D1FA70FA7236900FD601F /* LexBullant.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F620FA7236900FD601F /* LexBullant.cxx */; };
-		271D1FA80FA7236900FD601F /* LexCaml.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F630FA7236900FD601F /* LexCaml.cxx */; };
-		271D1FA90FA7236900FD601F /* LexCLW.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F640FA7236900FD601F /* LexCLW.cxx */; };
-		271D1FAA0FA7236900FD601F /* LexCmake.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F650FA7236900FD601F /* LexCmake.cxx */; };
-		271D1FAB0FA7236900FD601F /* LexCOBOL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F660FA7236900FD601F /* LexCOBOL.cxx */; };
-		271D1FAC0FA7236900FD601F /* LexConf.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F670FA7236900FD601F /* LexConf.cxx */; };
-		271D1FAD0FA7236900FD601F /* LexCrontab.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F680FA7236900FD601F /* LexCrontab.cxx */; };
-		271D1FAE0FA7236900FD601F /* LexCsound.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F690FA7236900FD601F /* LexCsound.cxx */; };
-		271D1FAF0FA7236900FD601F /* LexD.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F6A0FA7236900FD601F /* LexD.cxx */; };
-		271D1FB00FA7236900FD601F /* LexEiffel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F6B0FA7236900FD601F /* LexEiffel.cxx */; };
-		271D1FB10FA7236900FD601F /* LexErlang.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F6C0FA7236900FD601F /* LexErlang.cxx */; };
-		271D1FB20FA7236900FD601F /* LexEScript.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F6D0FA7236900FD601F /* LexEScript.cxx */; };
-		271D1FB30FA7236900FD601F /* LexFlagship.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F6E0FA7236900FD601F /* LexFlagship.cxx */; };
-		271D1FB40FA7236900FD601F /* LexForth.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F6F0FA7236900FD601F /* LexForth.cxx */; };
-		271D1FB50FA7236900FD601F /* LexFortran.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F700FA7236900FD601F /* LexFortran.cxx */; };
-		271D1FB60FA7236900FD601F /* LexGAP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F710FA7236900FD601F /* LexGAP.cxx */; };
-		271D1FB80FA7236900FD601F /* LexGui4Cli.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F730FA7236900FD601F /* LexGui4Cli.cxx */; };
-		271D1FB90FA7236900FD601F /* LexHaskell.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F740FA7236900FD601F /* LexHaskell.cxx */; };
-		271D1FBA0FA7236900FD601F /* LexInno.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F750FA7236900FD601F /* LexInno.cxx */; };
-		271D1FBB0FA7236900FD601F /* LexKix.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F760FA7236900FD601F /* LexKix.cxx */; };
-		271D1FBC0FA7236900FD601F /* LexLisp.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F770FA7236900FD601F /* LexLisp.cxx */; };
-		271D1FBD0FA7236900FD601F /* LexLout.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F780FA7236900FD601F /* LexLout.cxx */; };
-		271D1FBE0FA7236900FD601F /* LexMagik.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F790FA7236900FD601F /* LexMagik.cxx */; };
-		271D1FBF0FA7236900FD601F /* LexMatlab.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F7A0FA7236900FD601F /* LexMatlab.cxx */; };
-		271D1FC00FA7236900FD601F /* LexMetapost.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F7B0FA7236900FD601F /* LexMetapost.cxx */; };
-		271D1FC10FA7236900FD601F /* LexMMIXAL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F7C0FA7236900FD601F /* LexMMIXAL.cxx */; };
-		271D1FC20FA7236900FD601F /* LexMPT.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F7D0FA7236900FD601F /* LexMPT.cxx */; };
-		271D1FC30FA7236900FD601F /* LexNimrod.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F7E0FA7236900FD601F /* LexNimrod.cxx */; };
-		271D1FC40FA7236900FD601F /* LexNsis.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F7F0FA7236900FD601F /* LexNsis.cxx */; };
-		271D1FC50FA7236900FD601F /* LexOpal.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F800FA7236900FD601F /* LexOpal.cxx */; };
-		271D1FC60FA7236900FD601F /* LexOthers.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F810FA7236900FD601F /* LexOthers.cxx */; };
-		271D1FC70FA7236900FD601F /* LexPascal.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F820FA7236900FD601F /* LexPascal.cxx */; };
-		271D1FC80FA7236900FD601F /* LexPB.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F830FA7236900FD601F /* LexPB.cxx */; };
-		271D1FC90FA7236900FD601F /* LexPLM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F840FA7236900FD601F /* LexPLM.cxx */; };
-		271D1FCA0FA7236900FD601F /* LexPOV.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F850FA7236900FD601F /* LexPOV.cxx */; };
-		271D1FCB0FA7236900FD601F /* LexPowerPro.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F860FA7236900FD601F /* LexPowerPro.cxx */; };
-		271D1FCC0FA7236900FD601F /* LexPowerShell.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F870FA7236900FD601F /* LexPowerShell.cxx */; };
-		271D1FCD0FA7236900FD601F /* LexProgress.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F880FA7236900FD601F /* LexProgress.cxx */; };
-		271D1FCE0FA7236900FD601F /* LexPS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F890FA7236900FD601F /* LexPS.cxx */; };
-		271D1FCF0FA7236900FD601F /* LexR.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F8A0FA7236900FD601F /* LexR.cxx */; };
-		271D1FD00FA7236900FD601F /* LexRebol.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F8B0FA7236900FD601F /* LexRebol.cxx */; };
-		271D1FD10FA7236900FD601F /* LexRuby.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F8C0FA7236900FD601F /* LexRuby.cxx */; };
-		271D1FD20FA7236900FD601F /* LexScriptol.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F8D0FA7236900FD601F /* LexScriptol.cxx */; };
-		271D1FD30FA7236900FD601F /* LexSmalltalk.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F8E0FA7236900FD601F /* LexSmalltalk.cxx */; };
-		271D1FD40FA7236900FD601F /* LexSML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F8F0FA7236900FD601F /* LexSML.cxx */; };
-		271D1FD50FA7236900FD601F /* LexSorcus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F900FA7236900FD601F /* LexSorcus.cxx */; };
-		271D1FD60FA7236900FD601F /* LexSpecman.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F910FA7236900FD601F /* LexSpecman.cxx */; };
-		271D1FD70FA7236900FD601F /* LexSpice.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F920FA7236900FD601F /* LexSpice.cxx */; };
-		271D1FD80FA7236900FD601F /* LexTACL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F930FA7236900FD601F /* LexTACL.cxx */; };
-		271D1FD90FA7236900FD601F /* LexTADS3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F940FA7236900FD601F /* LexTADS3.cxx */; };
-		271D1FDA0FA7236900FD601F /* LexTAL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F950FA7236900FD601F /* LexTAL.cxx */; };
-		271D1FDB0FA7236900FD601F /* LexTCL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F960FA7236900FD601F /* LexTCL.cxx */; };
-		271D1FDC0FA7236900FD601F /* LexTeX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F970FA7236900FD601F /* LexTeX.cxx */; };
-		271D1FDD0FA7236900FD601F /* LexVB.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F980FA7236900FD601F /* LexVB.cxx */; };
-		271D1FDE0FA7236900FD601F /* LexVerilog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F990FA7236900FD601F /* LexVerilog.cxx */; };
-		271D1FDF0FA7236900FD601F /* LexVHDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F9A0FA7236900FD601F /* LexVHDL.cxx */; };
-		271D1FE00FA7236900FD601F /* LexYAML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F9B0FA7236900FD601F /* LexYAML.cxx */; };
-		271D1FE10FA7236900FD601F /* PerLine.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 271D1F9C0FA7236900FD601F /* PerLine.cxx */; };
 		271FA52C0F850BE20033D021 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 271FA52B0F850BE20033D021 /* AppController.mm */; };
-		272133530F9732D2006BE49A /* ScintillaView.h in Headers */ = {isa = PBXBuildFile; fileRef = 274A05980F85FB2600B2D3B7 /* ScintillaView.h */; };
-		272133590F973324006BE49A /* ScintillaCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC1C0F85E96F00638A46 /* ScintillaCocoa.mm */; };
-		2721335A0F973324006BE49A /* AutoComplete.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC1E0F85E9C000638A46 /* AutoComplete.cxx */; };
-		2721335B0F973324006BE49A /* CallTip.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC1F0F85E9C000638A46 /* CallTip.cxx */; };
-		2721335C0F973324006BE49A /* CellBuffer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC200F85E9C000638A46 /* CellBuffer.cxx */; };
-		2721335D0F973324006BE49A /* CharClassify.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC210F85E9C000638A46 /* CharClassify.cxx */; };
-		2721335E0F973324006BE49A /* ContractionState.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC220F85E9C000638A46 /* ContractionState.cxx */; };
-		2721335F0F973324006BE49A /* Decoration.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC230F85E9C000638A46 /* Decoration.cxx */; };
-		272133600F973324006BE49A /* Document.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC240F85E9C000638A46 /* Document.cxx */; };
-		272133610F973324006BE49A /* DocumentAccessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC250F85E9C000638A46 /* DocumentAccessor.cxx */; };
-		272133620F973324006BE49A /* Editor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC260F85E9C000638A46 /* Editor.cxx */; };
-		272133630F973324006BE49A /* ExternalLexer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC270F85E9C000638A46 /* ExternalLexer.cxx */; };
-		272133640F973324006BE49A /* Indicator.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC280F85E9C000638A46 /* Indicator.cxx */; };
-		272133650F973324006BE49A /* KeyMap.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC290F85E9C000638A46 /* KeyMap.cxx */; };
-		272133660F973324006BE49A /* KeyWords.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC2A0F85E9C000638A46 /* KeyWords.cxx */; };
-		272133670F973324006BE49A /* LexCPP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC2B0F85E9C000638A46 /* LexCPP.cxx */; };
-		272133680F973324006BE49A /* LexCSS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC2C0F85E9C000638A46 /* LexCSS.cxx */; };
-		272133690F973324006BE49A /* LexHTML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC2D0F85E9C000638A46 /* LexHTML.cxx */; };
-		2721336A0F973324006BE49A /* LexLua.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC2E0F85E9C000638A46 /* LexLua.cxx */; };
-		2721336B0F973324006BE49A /* LexMSSQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC2F0F85E9C000638A46 /* LexMSSQL.cxx */; };
-		2721336C0F973324006BE49A /* LexMySQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC300F85E9C000638A46 /* LexMySQL.cxx */; };
-		2721336D0F973324006BE49A /* LexPerl.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC310F85E9C000638A46 /* LexPerl.cxx */; };
-		2721336E0F973324006BE49A /* LexPython.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC320F85E9C000638A46 /* LexPython.cxx */; };
-		2721336F0F973324006BE49A /* LexSQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC330F85E9C000638A46 /* LexSQL.cxx */; };
-		272133700F973324006BE49A /* LineMarker.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC340F85E9C000638A46 /* LineMarker.cxx */; };
-		272133710F973324006BE49A /* PositionCache.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC350F85E9C000638A46 /* PositionCache.cxx */; };
-		272133720F973324006BE49A /* PropSet.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC360F85E9C000638A46 /* PropSet.cxx */; };
-		272133730F973324006BE49A /* RESearch.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC370F85E9C000638A46 /* RESearch.cxx */; };
-		272133740F973324006BE49A /* RunStyles.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC380F85E9C000638A46 /* RunStyles.cxx */; };
-		272133750F973324006BE49A /* ScintillaBase.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC390F85E9C000638A46 /* ScintillaBase.cxx */; };
-		272133760F973324006BE49A /* Style.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC3A0F85E9C000638A46 /* Style.cxx */; };
-		272133770F973324006BE49A /* StyleContext.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC3B0F85E9C000638A46 /* StyleContext.cxx */; };
-		272133780F973324006BE49A /* UniConversion.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC3C0F85E9C000638A46 /* UniConversion.cxx */; };
-		272133790F973324006BE49A /* ViewStyle.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC3D0F85E9C000638A46 /* ViewStyle.cxx */; };
-		2721337A0F973324006BE49A /* WindowAccessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC3E0F85E9C000638A46 /* WindowAccessor.cxx */; };
-		2721337B0F973324006BE49A /* XPM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFC3F0F85E9C000638A46 /* XPM.cxx */; };
-		2721337C0F973324006BE49A /* LexBash.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 27EDFCA60F85EA0F00638A46 /* LexBash.cxx */; };
-		2721337D0F973324006BE49A /* PlatCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 274A05630F85F18900B2D3B7 /* PlatCocoa.mm */; };
-		2721337E0F973324006BE49A /* ScintillaView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 274A05990F85FB2600B2D3B7 /* ScintillaView.mm */; };
-		272133BE0F97354B006BE49A /* Scintilla.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 272133480F9731CB006BE49A /* Scintilla.framework */; };
-		272133C10F973581006BE49A /* Scintilla.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 272133480F9731CB006BE49A /* Scintilla.framework */; };
-		2721342E0F974971006BE49A /* mac_cursor_busy.png in Resources */ = {isa = PBXBuildFile; fileRef = 2721342C0F974971006BE49A /* mac_cursor_busy.png */; };
-		2721342F0F974971006BE49A /* mac_cursor_flipped.png in Resources */ = {isa = PBXBuildFile; fileRef = 2721342D0F974971006BE49A /* mac_cursor_flipped.png */; };
-		274CDFE60F9DBA4E00B64ADC /* TestData.sql in Resources */ = {isa = PBXBuildFile; fileRef = 274CDFE50F9DBA4E00B64ADC /* TestData.sql */; };
+		2791F4490FC1A8E9009DBCF9 /* TestData.sql in Resources */ = {isa = PBXBuildFile; fileRef = 2791F4480FC1A8E9009DBCF9 /* TestData.sql */; };
+		27AF7EC30FC2C351007160EF /* Scintilla.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2744E5EA0FC16BE200E85C33 /* Scintilla.framework */; };
+		27AF7ECA0FC2C388007160EF /* Scintilla.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2744E5EA0FC16BE200E85C33 /* Scintilla.framework */; };
 		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		272133C30F97361C006BE49A /* PBXContainerItemProxy */ = {
+		2744E5E90FC16BE200E85C33 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+			containerPortal = 2744E5E20FC16BE200E85C33 /* ScintillaFramework.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
+			remoteInfo = Scintilla;
+		};
+		27AF7EC60FC2C36A007160EF /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 2744E5E20FC16BE200E85C33 /* ScintillaFramework.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = 272133470F9731CB006BE49A;
+			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
 			remoteInfo = Scintilla;
 		};
 /* End PBXContainerItemProxy section */
@@ -143,7 +41,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				272133C10F973581006BE49A /* Scintilla.framework in CopyFiles */,
+				27AF7ECA0FC2C388007160EF /* Scintilla.framework in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -154,160 +52,10 @@
 		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
 		1DDD58150DA1D0A300B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
-		271D1F580FA7236900FD601F /* LexAbaqus.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAbaqus.cxx; path = ../../src/LexAbaqus.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F590FA7236900FD601F /* LexAda.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAda.cxx; path = ../../src/LexAda.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F5A0FA7236900FD601F /* LexAPDL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAPDL.cxx; path = ../../src/LexAPDL.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F5B0FA7236900FD601F /* LexAsm.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAsm.cxx; path = ../../src/LexAsm.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F5C0FA7236900FD601F /* LexAsn1.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAsn1.cxx; path = ../../src/LexAsn1.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F5D0FA7236900FD601F /* LexASY.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexASY.cxx; path = ../../src/LexASY.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F5E0FA7236900FD601F /* LexAU3.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAU3.cxx; path = ../../src/LexAU3.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F5F0FA7236900FD601F /* LexAVE.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAVE.cxx; path = ../../src/LexAVE.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F600FA7236900FD601F /* LexBaan.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexBaan.cxx; path = ../../src/LexBaan.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F610FA7236900FD601F /* LexBasic.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexBasic.cxx; path = ../../src/LexBasic.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F620FA7236900FD601F /* LexBullant.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexBullant.cxx; path = ../../src/LexBullant.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F630FA7236900FD601F /* LexCaml.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCaml.cxx; path = ../../src/LexCaml.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F640FA7236900FD601F /* LexCLW.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCLW.cxx; path = ../../src/LexCLW.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F650FA7236900FD601F /* LexCmake.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCmake.cxx; path = ../../src/LexCmake.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F660FA7236900FD601F /* LexCOBOL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCOBOL.cxx; path = ../../src/LexCOBOL.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F670FA7236900FD601F /* LexConf.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexConf.cxx; path = ../../src/LexConf.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F680FA7236900FD601F /* LexCrontab.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCrontab.cxx; path = ../../src/LexCrontab.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F690FA7236900FD601F /* LexCsound.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCsound.cxx; path = ../../src/LexCsound.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F6A0FA7236900FD601F /* LexD.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexD.cxx; path = ../../src/LexD.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F6B0FA7236900FD601F /* LexEiffel.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexEiffel.cxx; path = ../../src/LexEiffel.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F6C0FA7236900FD601F /* LexErlang.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexErlang.cxx; path = ../../src/LexErlang.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F6D0FA7236900FD601F /* LexEScript.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexEScript.cxx; path = ../../src/LexEScript.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F6E0FA7236900FD601F /* LexFlagship.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexFlagship.cxx; path = ../../src/LexFlagship.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F6F0FA7236900FD601F /* LexForth.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexForth.cxx; path = ../../src/LexForth.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F700FA7236900FD601F /* LexFortran.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexFortran.cxx; path = ../../src/LexFortran.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F710FA7236900FD601F /* LexGAP.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexGAP.cxx; path = ../../src/LexGAP.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F730FA7236900FD601F /* LexGui4Cli.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexGui4Cli.cxx; path = ../../src/LexGui4Cli.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F740FA7236900FD601F /* LexHaskell.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexHaskell.cxx; path = ../../src/LexHaskell.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F750FA7236900FD601F /* LexInno.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexInno.cxx; path = ../../src/LexInno.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F760FA7236900FD601F /* LexKix.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexKix.cxx; path = ../../src/LexKix.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F770FA7236900FD601F /* LexLisp.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexLisp.cxx; path = ../../src/LexLisp.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F780FA7236900FD601F /* LexLout.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexLout.cxx; path = ../../src/LexLout.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F790FA7236900FD601F /* LexMagik.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMagik.cxx; path = ../../src/LexMagik.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F7A0FA7236900FD601F /* LexMatlab.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMatlab.cxx; path = ../../src/LexMatlab.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F7B0FA7236900FD601F /* LexMetapost.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMetapost.cxx; path = ../../src/LexMetapost.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F7C0FA7236900FD601F /* LexMMIXAL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMMIXAL.cxx; path = ../../src/LexMMIXAL.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F7D0FA7236900FD601F /* LexMPT.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMPT.cxx; path = ../../src/LexMPT.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F7E0FA7236900FD601F /* LexNimrod.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexNimrod.cxx; path = ../../src/LexNimrod.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F7F0FA7236900FD601F /* LexNsis.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexNsis.cxx; path = ../../src/LexNsis.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F800FA7236900FD601F /* LexOpal.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexOpal.cxx; path = ../../src/LexOpal.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F810FA7236900FD601F /* LexOthers.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexOthers.cxx; path = ../../src/LexOthers.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F820FA7236900FD601F /* LexPascal.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPascal.cxx; path = ../../src/LexPascal.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F830FA7236900FD601F /* LexPB.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPB.cxx; path = ../../src/LexPB.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F840FA7236900FD601F /* LexPLM.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPLM.cxx; path = ../../src/LexPLM.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F850FA7236900FD601F /* LexPOV.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPOV.cxx; path = ../../src/LexPOV.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F860FA7236900FD601F /* LexPowerPro.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPowerPro.cxx; path = ../../src/LexPowerPro.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F870FA7236900FD601F /* LexPowerShell.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPowerShell.cxx; path = ../../src/LexPowerShell.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F880FA7236900FD601F /* LexProgress.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexProgress.cxx; path = ../../src/LexProgress.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F890FA7236900FD601F /* LexPS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPS.cxx; path = ../../src/LexPS.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F8A0FA7236900FD601F /* LexR.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexR.cxx; path = ../../src/LexR.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F8B0FA7236900FD601F /* LexRebol.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexRebol.cxx; path = ../../src/LexRebol.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F8C0FA7236900FD601F /* LexRuby.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexRuby.cxx; path = ../../src/LexRuby.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F8D0FA7236900FD601F /* LexScriptol.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexScriptol.cxx; path = ../../src/LexScriptol.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F8E0FA7236900FD601F /* LexSmalltalk.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSmalltalk.cxx; path = ../../src/LexSmalltalk.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F8F0FA7236900FD601F /* LexSML.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSML.cxx; path = ../../src/LexSML.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F900FA7236900FD601F /* LexSorcus.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSorcus.cxx; path = ../../src/LexSorcus.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F910FA7236900FD601F /* LexSpecman.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpecman.cxx; path = ../../src/LexSpecman.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F920FA7236900FD601F /* LexSpice.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpice.cxx; path = ../../src/LexSpice.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F930FA7236900FD601F /* LexTACL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTACL.cxx; path = ../../src/LexTACL.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F940FA7236900FD601F /* LexTADS3.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTADS3.cxx; path = ../../src/LexTADS3.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F950FA7236900FD601F /* LexTAL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTAL.cxx; path = ../../src/LexTAL.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F960FA7236900FD601F /* LexTCL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTCL.cxx; path = ../../src/LexTCL.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F970FA7236900FD601F /* LexTeX.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTeX.cxx; path = ../../src/LexTeX.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F980FA7236900FD601F /* LexVB.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexVB.cxx; path = ../../src/LexVB.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F990FA7236900FD601F /* LexVerilog.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexVerilog.cxx; path = ../../src/LexVerilog.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F9A0FA7236900FD601F /* LexVHDL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexVHDL.cxx; path = ../../src/LexVHDL.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F9B0FA7236900FD601F /* LexYAML.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexYAML.cxx; path = ../../src/LexYAML.cxx; sourceTree = SOURCE_ROOT; };
-		271D1F9C0FA7236900FD601F /* PerLine.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PerLine.cxx; path = ../../src/PerLine.cxx; sourceTree = SOURCE_ROOT; };
-		271D1FE20FA7238400FD601F /* PerLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PerLine.h; path = ../../src/PerLine.h; sourceTree = SOURCE_ROOT; };
 		271FA52A0F850BE20033D021 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; };
 		271FA52B0F850BE20033D021 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = "<group>"; wrapsLines = 0; };
-		272133480F9731CB006BE49A /* Scintilla.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Scintilla.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		272133490F9731CB006BE49A /* Scintilla-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Scintilla-Info.plist"; sourceTree = "<group>"; };
-		2721342C0F974971006BE49A /* mac_cursor_busy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mac_cursor_busy.png; path = ../res/mac_cursor_busy.png; sourceTree = SOURCE_ROOT; };
-		2721342D0F974971006BE49A /* mac_cursor_flipped.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mac_cursor_flipped.png; path = ../res/mac_cursor_flipped.png; sourceTree = SOURCE_ROOT; };
-		274A05630F85F18900B2D3B7 /* PlatCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PlatCocoa.mm; path = ../PlatCocoa.mm; sourceTree = SOURCE_ROOT; };
-		274A05980F85FB2600B2D3B7 /* ScintillaView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScintillaView.h; path = ../ScintillaView.h; sourceTree = SOURCE_ROOT; };
-		274A05990F85FB2600B2D3B7 /* ScintillaView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ScintillaView.mm; path = ../ScintillaView.mm; sourceTree = SOURCE_ROOT; };
-		274CDFE50F9DBA4E00B64ADC /* TestData.sql */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TestData.sql; sourceTree = SOURCE_ROOT; };
-		27EDFC100F85E95000638A46 /* PlatCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlatCocoa.h; path = ../PlatCocoa.h; sourceTree = SOURCE_ROOT; };
-		27EDFC110F85E95000638A46 /* QuartzTextLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuartzTextLayout.h; path = ../QuartzTextLayout.h; sourceTree = SOURCE_ROOT; };
-		27EDFC120F85E95000638A46 /* QuartzTextStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuartzTextStyle.h; path = ../QuartzTextStyle.h; sourceTree = SOURCE_ROOT; };
-		27EDFC130F85E95000638A46 /* QuartzTextStyleAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuartzTextStyleAttribute.h; path = ../QuartzTextStyleAttribute.h; sourceTree = SOURCE_ROOT; };
-		27EDFC140F85E95000638A46 /* ScintillaCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScintillaCocoa.h; path = ../ScintillaCocoa.h; sourceTree = SOURCE_ROOT; };
-		27EDFC1C0F85E96F00638A46 /* ScintillaCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; name = ScintillaCocoa.mm; path = ../ScintillaCocoa.mm; sourceTree = SOURCE_ROOT; tabWidth = 2; usesTabs = 0; wrapsLines = 0; };
-		27EDFC1E0F85E9C000638A46 /* AutoComplete.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AutoComplete.cxx; path = ../../src/AutoComplete.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC1F0F85E9C000638A46 /* CallTip.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CallTip.cxx; path = ../../src/CallTip.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC200F85E9C000638A46 /* CellBuffer.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CellBuffer.cxx; path = ../../src/CellBuffer.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC210F85E9C000638A46 /* CharClassify.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CharClassify.cxx; path = ../../src/CharClassify.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC220F85E9C000638A46 /* ContractionState.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ContractionState.cxx; path = ../../src/ContractionState.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC230F85E9C000638A46 /* Decoration.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Decoration.cxx; path = ../../src/Decoration.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC240F85E9C000638A46 /* Document.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Document.cxx; path = ../../src/Document.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC250F85E9C000638A46 /* DocumentAccessor.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DocumentAccessor.cxx; path = ../../src/DocumentAccessor.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC260F85E9C000638A46 /* Editor.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Editor.cxx; path = ../../src/Editor.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC270F85E9C000638A46 /* ExternalLexer.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ExternalLexer.cxx; path = ../../src/ExternalLexer.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC280F85E9C000638A46 /* Indicator.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Indicator.cxx; path = ../../src/Indicator.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC290F85E9C000638A46 /* KeyMap.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KeyMap.cxx; path = ../../src/KeyMap.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC2A0F85E9C000638A46 /* KeyWords.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KeyWords.cxx; path = ../../src/KeyWords.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC2B0F85E9C000638A46 /* LexCPP.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCPP.cxx; path = ../../src/LexCPP.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC2C0F85E9C000638A46 /* LexCSS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCSS.cxx; path = ../../src/LexCSS.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC2D0F85E9C000638A46 /* LexHTML.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexHTML.cxx; path = ../../src/LexHTML.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC2E0F85E9C000638A46 /* LexLua.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexLua.cxx; path = ../../src/LexLua.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC2F0F85E9C000638A46 /* LexMSSQL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMSSQL.cxx; path = ../../src/LexMSSQL.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC300F85E9C000638A46 /* LexMySQL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMySQL.cxx; path = ../../src/LexMySQL.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC310F85E9C000638A46 /* LexPerl.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPerl.cxx; path = ../../src/LexPerl.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC320F85E9C000638A46 /* LexPython.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPython.cxx; path = ../../src/LexPython.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC330F85E9C000638A46 /* LexSQL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSQL.cxx; path = ../../src/LexSQL.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC340F85E9C000638A46 /* LineMarker.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LineMarker.cxx; path = ../../src/LineMarker.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC350F85E9C000638A46 /* PositionCache.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PositionCache.cxx; path = ../../src/PositionCache.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC360F85E9C000638A46 /* PropSet.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PropSet.cxx; path = ../../src/PropSet.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC370F85E9C000638A46 /* RESearch.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RESearch.cxx; path = ../../src/RESearch.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC380F85E9C000638A46 /* RunStyles.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RunStyles.cxx; path = ../../src/RunStyles.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC390F85E9C000638A46 /* ScintillaBase.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ScintillaBase.cxx; path = ../../src/ScintillaBase.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC3A0F85E9C000638A46 /* Style.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Style.cxx; path = ../../src/Style.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC3B0F85E9C000638A46 /* StyleContext.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleContext.cxx; path = ../../src/StyleContext.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC3C0F85E9C000638A46 /* UniConversion.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UniConversion.cxx; path = ../../src/UniConversion.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC3D0F85E9C000638A46 /* ViewStyle.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ViewStyle.cxx; path = ../../src/ViewStyle.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC3E0F85E9C000638A46 /* WindowAccessor.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WindowAccessor.cxx; path = ../../src/WindowAccessor.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC3F0F85E9C000638A46 /* XPM.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XPM.cxx; path = ../../src/XPM.cxx; sourceTree = SOURCE_ROOT; };
-		27EDFC620F85E9DA00638A46 /* Accessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Accessor.h; path = ../../include/Accessor.h; sourceTree = SOURCE_ROOT; };
-		27EDFC630F85E9DA00638A46 /* KeyWords.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KeyWords.h; path = ../../include/KeyWords.h; sourceTree = SOURCE_ROOT; };
-		27EDFC640F85E9DA00638A46 /* Platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Platform.h; path = ../../include/Platform.h; sourceTree = SOURCE_ROOT; };
-		27EDFC650F85E9DA00638A46 /* PropSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PropSet.h; path = ../../include/PropSet.h; sourceTree = SOURCE_ROOT; };
-		27EDFC660F85E9DA00638A46 /* SciLexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SciLexer.h; path = ../../include/SciLexer.h; sourceTree = SOURCE_ROOT; };
-		27EDFC670F85E9DA00638A46 /* Scintilla.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Scintilla.h; path = ../../include/Scintilla.h; sourceTree = SOURCE_ROOT; };
-		27EDFC680F85E9DA00638A46 /* SString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SString.h; path = ../../include/SString.h; sourceTree = SOURCE_ROOT; };
-		27EDFC690F85E9DA00638A46 /* WindowAccessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WindowAccessor.h; path = ../../include/WindowAccessor.h; sourceTree = SOURCE_ROOT; };
-		27EDFC720F85E9FF00638A46 /* AutoComplete.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AutoComplete.h; path = ../../src/AutoComplete.h; sourceTree = SOURCE_ROOT; };
-		27EDFC730F85E9FF00638A46 /* CallTip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CallTip.h; path = ../../src/CallTip.h; sourceTree = SOURCE_ROOT; };
-		27EDFC740F85E9FF00638A46 /* CellBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CellBuffer.h; path = ../../src/CellBuffer.h; sourceTree = SOURCE_ROOT; };
-		27EDFC750F85E9FF00638A46 /* CharacterSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CharacterSet.h; path = ../../src/CharacterSet.h; sourceTree = SOURCE_ROOT; };
-		27EDFC760F85E9FF00638A46 /* CharClassify.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CharClassify.h; path = ../../src/CharClassify.h; sourceTree = SOURCE_ROOT; };
-		27EDFC770F85E9FF00638A46 /* ContractionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ContractionState.h; path = ../../src/ContractionState.h; sourceTree = SOURCE_ROOT; };
-		27EDFC780F85E9FF00638A46 /* Decoration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Decoration.h; path = ../../src/Decoration.h; sourceTree = SOURCE_ROOT; };
-		27EDFC790F85E9FF00638A46 /* Document.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Document.h; path = ../../src/Document.h; sourceTree = SOURCE_ROOT; };
-		27EDFC7A0F85E9FF00638A46 /* DocumentAccessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DocumentAccessor.h; path = ../../src/DocumentAccessor.h; sourceTree = SOURCE_ROOT; };
-		27EDFC7B0F85E9FF00638A46 /* Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Editor.h; path = ../../src/Editor.h; sourceTree = SOURCE_ROOT; };
-		27EDFC7C0F85E9FF00638A46 /* ExternalLexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExternalLexer.h; path = ../../src/ExternalLexer.h; sourceTree = SOURCE_ROOT; };
-		27EDFC7D0F85E9FF00638A46 /* Indicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Indicator.h; path = ../../src/Indicator.h; sourceTree = SOURCE_ROOT; };
-		27EDFC7E0F85E9FF00638A46 /* KeyMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KeyMap.h; path = ../../src/KeyMap.h; sourceTree = SOURCE_ROOT; };
-		27EDFC7F0F85E9FF00638A46 /* LineMarker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LineMarker.h; path = ../../src/LineMarker.h; sourceTree = SOURCE_ROOT; };
-		27EDFC800F85E9FF00638A46 /* Partitioning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Partitioning.h; path = ../../src/Partitioning.h; sourceTree = SOURCE_ROOT; };
-		27EDFC810F85E9FF00638A46 /* PositionCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PositionCache.h; path = ../../src/PositionCache.h; sourceTree = SOURCE_ROOT; };
-		27EDFC820F85E9FF00638A46 /* RESearch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RESearch.h; path = ../../src/RESearch.h; sourceTree = SOURCE_ROOT; };
-		27EDFC830F85E9FF00638A46 /* RunStyles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RunStyles.h; path = ../../src/RunStyles.h; sourceTree = SOURCE_ROOT; };
-		27EDFC840F85E9FF00638A46 /* ScintillaBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScintillaBase.h; path = ../../src/ScintillaBase.h; sourceTree = SOURCE_ROOT; };
-		27EDFC850F85E9FF00638A46 /* SplitVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SplitVector.h; path = ../../src/SplitVector.h; sourceTree = SOURCE_ROOT; };
-		27EDFC860F85E9FF00638A46 /* Style.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Style.h; path = ../../src/Style.h; sourceTree = SOURCE_ROOT; };
-		27EDFC870F85E9FF00638A46 /* StyleContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleContext.h; path = ../../src/StyleContext.h; sourceTree = SOURCE_ROOT; };
-		27EDFC880F85E9FF00638A46 /* SVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SVector.h; path = ../../src/SVector.h; sourceTree = SOURCE_ROOT; };
-		27EDFC890F85E9FF00638A46 /* UniConversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UniConversion.h; path = ../../src/UniConversion.h; sourceTree = SOURCE_ROOT; };
-		27EDFC8A0F85E9FF00638A46 /* ViewStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewStyle.h; path = ../../src/ViewStyle.h; sourceTree = SOURCE_ROOT; };
-		27EDFC8B0F85E9FF00638A46 /* XPM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XPM.h; path = ../../src/XPM.h; sourceTree = SOURCE_ROOT; };
-		27EDFCA60F85EA0F00638A46 /* LexBash.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexBash.cxx; path = ../../src/LexBash.cxx; sourceTree = SOURCE_ROOT; };
+		2744E5E20FC16BE200E85C33 /* ScintillaFramework.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ScintillaFramework.xcodeproj; path = ../ScintillaFramework/ScintillaFramework.xcodeproj; sourceTree = SOURCE_ROOT; };
+		2791F4480FC1A8E9009DBCF9 /* TestData.sql */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TestData.sql; sourceTree = "<group>"; };
 		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
@@ -317,18 +65,11 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		272133460F9731CB006BE49A /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		8D11072E0486CEB800E47090 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				272133BE0F97354B006BE49A /* Scintilla.framework in Frameworks */,
+				27AF7EC30FC2C351007160EF /* Scintilla.framework in Frameworks */,
 				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -367,199 +108,27 @@
 			isa = PBXGroup;
 			children = (
 				8D1107320486CEB800E47090 /* ScintillaTest.app */,
-				272133480F9731CB006BE49A /* Scintilla.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		274A05B40F85FE3900B2D3B7 /* Cocoa */ = {
-			isa = PBXGroup;
-			children = (
-				27EDFC100F85E95000638A46 /* PlatCocoa.h */,
-				27EDFC110F85E95000638A46 /* QuartzTextLayout.h */,
-				27EDFC120F85E95000638A46 /* QuartzTextStyle.h */,
-				27EDFC130F85E95000638A46 /* QuartzTextStyleAttribute.h */,
-				27EDFC140F85E95000638A46 /* ScintillaCocoa.h */,
-				27EDFC1C0F85E96F00638A46 /* ScintillaCocoa.mm */,
-				274A05980F85FB2600B2D3B7 /* ScintillaView.h */,
-				274A05990F85FB2600B2D3B7 /* ScintillaView.mm */,
-				274A05630F85F18900B2D3B7 /* PlatCocoa.mm */,
-			);
-			name = Cocoa;
-			sourceTree = "<group>";
-		};
-		27EDFCA80F85EA1800638A46 /* Scintilla */ = {
-			isa = PBXGroup;
-			children = (
-				274A05B40F85FE3900B2D3B7 /* Cocoa */,
-				27EDFCAA0F85EA3C00638A46 /* Source Files */,
-				27EDFCA90F85EA1F00638A46 /* Header Files */,
-			);
-			name = Scintilla;
-			sourceTree = "<group>";
-		};
-		27EDFCA90F85EA1F00638A46 /* Header Files */ = {
-			isa = PBXGroup;
-			children = (
-				271D1FE20FA7238400FD601F /* PerLine.h */,
-				27EDFC690F85E9DA00638A46 /* WindowAccessor.h */,
-				27EDFC720F85E9FF00638A46 /* AutoComplete.h */,
-				27EDFC730F85E9FF00638A46 /* CallTip.h */,
-				27EDFC740F85E9FF00638A46 /* CellBuffer.h */,
-				27EDFC750F85E9FF00638A46 /* CharacterSet.h */,
-				27EDFC760F85E9FF00638A46 /* CharClassify.h */,
-				27EDFC770F85E9FF00638A46 /* ContractionState.h */,
-				27EDFC780F85E9FF00638A46 /* Decoration.h */,
-				27EDFC790F85E9FF00638A46 /* Document.h */,
-				27EDFC7A0F85E9FF00638A46 /* DocumentAccessor.h */,
-				27EDFC7B0F85E9FF00638A46 /* Editor.h */,
-				27EDFC7C0F85E9FF00638A46 /* ExternalLexer.h */,
-				27EDFC7D0F85E9FF00638A46 /* Indicator.h */,
-				27EDFC7E0F85E9FF00638A46 /* KeyMap.h */,
-				27EDFC7F0F85E9FF00638A46 /* LineMarker.h */,
-				27EDFC800F85E9FF00638A46 /* Partitioning.h */,
-				27EDFC810F85E9FF00638A46 /* PositionCache.h */,
-				27EDFC820F85E9FF00638A46 /* RESearch.h */,
-				27EDFC830F85E9FF00638A46 /* RunStyles.h */,
-				27EDFC840F85E9FF00638A46 /* ScintillaBase.h */,
-				27EDFC850F85E9FF00638A46 /* SplitVector.h */,
-				27EDFC860F85E9FF00638A46 /* Style.h */,
-				27EDFC870F85E9FF00638A46 /* StyleContext.h */,
-				27EDFC880F85E9FF00638A46 /* SVector.h */,
-				27EDFC890F85E9FF00638A46 /* UniConversion.h */,
-				27EDFC8A0F85E9FF00638A46 /* ViewStyle.h */,
-				27EDFC8B0F85E9FF00638A46 /* XPM.h */,
-				27EDFC620F85E9DA00638A46 /* Accessor.h */,
-				27EDFC630F85E9DA00638A46 /* KeyWords.h */,
-				27EDFC640F85E9DA00638A46 /* Platform.h */,
-				27EDFC650F85E9DA00638A46 /* PropSet.h */,
-				27EDFC660F85E9DA00638A46 /* SciLexer.h */,
-				27EDFC670F85E9DA00638A46 /* Scintilla.h */,
-				27EDFC680F85E9DA00638A46 /* SString.h */,
-			);
-			name = "Header Files";
-			sourceTree = "<group>";
-		};
-		27EDFCAA0F85EA3C00638A46 /* Source Files */ = {
+		2744E5E30FC16BE200E85C33 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				271D1F580FA7236900FD601F /* LexAbaqus.cxx */,
-				271D1F590FA7236900FD601F /* LexAda.cxx */,
-				271D1F5A0FA7236900FD601F /* LexAPDL.cxx */,
-				271D1F5B0FA7236900FD601F /* LexAsm.cxx */,
-				271D1F5C0FA7236900FD601F /* LexAsn1.cxx */,
-				271D1F5D0FA7236900FD601F /* LexASY.cxx */,
-				271D1F5E0FA7236900FD601F /* LexAU3.cxx */,
-				271D1F5F0FA7236900FD601F /* LexAVE.cxx */,
-				271D1F600FA7236900FD601F /* LexBaan.cxx */,
-				271D1F610FA7236900FD601F /* LexBasic.cxx */,
-				271D1F620FA7236900FD601F /* LexBullant.cxx */,
-				271D1F630FA7236900FD601F /* LexCaml.cxx */,
-				271D1F640FA7236900FD601F /* LexCLW.cxx */,
-				271D1F650FA7236900FD601F /* LexCmake.cxx */,
-				271D1F660FA7236900FD601F /* LexCOBOL.cxx */,
-				271D1F670FA7236900FD601F /* LexConf.cxx */,
-				271D1F680FA7236900FD601F /* LexCrontab.cxx */,
-				271D1F690FA7236900FD601F /* LexCsound.cxx */,
-				271D1F6A0FA7236900FD601F /* LexD.cxx */,
-				271D1F6B0FA7236900FD601F /* LexEiffel.cxx */,
-				271D1F6C0FA7236900FD601F /* LexErlang.cxx */,
-				271D1F6D0FA7236900FD601F /* LexEScript.cxx */,
-				271D1F6E0FA7236900FD601F /* LexFlagship.cxx */,
-				271D1F6F0FA7236900FD601F /* LexForth.cxx */,
-				271D1F700FA7236900FD601F /* LexFortran.cxx */,
-				271D1F710FA7236900FD601F /* LexGAP.cxx */,
-				271D1F730FA7236900FD601F /* LexGui4Cli.cxx */,
-				271D1F740FA7236900FD601F /* LexHaskell.cxx */,
-				271D1F750FA7236900FD601F /* LexInno.cxx */,
-				271D1F760FA7236900FD601F /* LexKix.cxx */,
-				271D1F770FA7236900FD601F /* LexLisp.cxx */,
-				271D1F780FA7236900FD601F /* LexLout.cxx */,
-				271D1F790FA7236900FD601F /* LexMagik.cxx */,
-				271D1F7A0FA7236900FD601F /* LexMatlab.cxx */,
-				271D1F7B0FA7236900FD601F /* LexMetapost.cxx */,
-				271D1F7C0FA7236900FD601F /* LexMMIXAL.cxx */,
-				271D1F7D0FA7236900FD601F /* LexMPT.cxx */,
-				271D1F7E0FA7236900FD601F /* LexNimrod.cxx */,
-				271D1F7F0FA7236900FD601F /* LexNsis.cxx */,
-				271D1F800FA7236900FD601F /* LexOpal.cxx */,
-				271D1F810FA7236900FD601F /* LexOthers.cxx */,
-				271D1F820FA7236900FD601F /* LexPascal.cxx */,
-				271D1F830FA7236900FD601F /* LexPB.cxx */,
-				271D1F840FA7236900FD601F /* LexPLM.cxx */,
-				271D1F850FA7236900FD601F /* LexPOV.cxx */,
-				271D1F860FA7236900FD601F /* LexPowerPro.cxx */,
-				271D1F870FA7236900FD601F /* LexPowerShell.cxx */,
-				271D1F880FA7236900FD601F /* LexProgress.cxx */,
-				271D1F890FA7236900FD601F /* LexPS.cxx */,
-				271D1F8A0FA7236900FD601F /* LexR.cxx */,
-				271D1F8B0FA7236900FD601F /* LexRebol.cxx */,
-				271D1F8C0FA7236900FD601F /* LexRuby.cxx */,
-				271D1F8D0FA7236900FD601F /* LexScriptol.cxx */,
-				271D1F8E0FA7236900FD601F /* LexSmalltalk.cxx */,
-				271D1F8F0FA7236900FD601F /* LexSML.cxx */,
-				271D1F900FA7236900FD601F /* LexSorcus.cxx */,
-				271D1F910FA7236900FD601F /* LexSpecman.cxx */,
-				271D1F920FA7236900FD601F /* LexSpice.cxx */,
-				271D1F930FA7236900FD601F /* LexTACL.cxx */,
-				271D1F940FA7236900FD601F /* LexTADS3.cxx */,
-				271D1F950FA7236900FD601F /* LexTAL.cxx */,
-				271D1F960FA7236900FD601F /* LexTCL.cxx */,
-				271D1F970FA7236900FD601F /* LexTeX.cxx */,
-				271D1F980FA7236900FD601F /* LexVB.cxx */,
-				271D1F990FA7236900FD601F /* LexVerilog.cxx */,
-				271D1F9A0FA7236900FD601F /* LexVHDL.cxx */,
-				271D1F9B0FA7236900FD601F /* LexYAML.cxx */,
-				271D1F9C0FA7236900FD601F /* PerLine.cxx */,
-				27EDFC1E0F85E9C000638A46 /* AutoComplete.cxx */,
-				27EDFC1F0F85E9C000638A46 /* CallTip.cxx */,
-				27EDFC200F85E9C000638A46 /* CellBuffer.cxx */,
-				27EDFC210F85E9C000638A46 /* CharClassify.cxx */,
-				27EDFC220F85E9C000638A46 /* ContractionState.cxx */,
-				27EDFC230F85E9C000638A46 /* Decoration.cxx */,
-				27EDFC240F85E9C000638A46 /* Document.cxx */,
-				27EDFC250F85E9C000638A46 /* DocumentAccessor.cxx */,
-				27EDFC260F85E9C000638A46 /* Editor.cxx */,
-				27EDFC270F85E9C000638A46 /* ExternalLexer.cxx */,
-				27EDFC280F85E9C000638A46 /* Indicator.cxx */,
-				27EDFC290F85E9C000638A46 /* KeyMap.cxx */,
-				27EDFC2A0F85E9C000638A46 /* KeyWords.cxx */,
-				27EDFC2B0F85E9C000638A46 /* LexCPP.cxx */,
-				27EDFC2C0F85E9C000638A46 /* LexCSS.cxx */,
-				27EDFC2D0F85E9C000638A46 /* LexHTML.cxx */,
-				27EDFC2E0F85E9C000638A46 /* LexLua.cxx */,
-				27EDFC2F0F85E9C000638A46 /* LexMSSQL.cxx */,
-				27EDFC300F85E9C000638A46 /* LexMySQL.cxx */,
-				27EDFC310F85E9C000638A46 /* LexPerl.cxx */,
-				27EDFC320F85E9C000638A46 /* LexPython.cxx */,
-				27EDFC330F85E9C000638A46 /* LexSQL.cxx */,
-				27EDFC340F85E9C000638A46 /* LineMarker.cxx */,
-				27EDFC350F85E9C000638A46 /* PositionCache.cxx */,
-				27EDFC360F85E9C000638A46 /* PropSet.cxx */,
-				27EDFC370F85E9C000638A46 /* RESearch.cxx */,
-				27EDFC380F85E9C000638A46 /* RunStyles.cxx */,
-				27EDFC390F85E9C000638A46 /* ScintillaBase.cxx */,
-				27EDFC3A0F85E9C000638A46 /* Style.cxx */,
-				27EDFC3B0F85E9C000638A46 /* StyleContext.cxx */,
-				27EDFC3C0F85E9C000638A46 /* UniConversion.cxx */,
-				27EDFC3D0F85E9C000638A46 /* ViewStyle.cxx */,
-				27EDFC3E0F85E9C000638A46 /* WindowAccessor.cxx */,
-				27EDFC3F0F85E9C000638A46 /* XPM.cxx */,
-				27EDFCA60F85EA0F00638A46 /* LexBash.cxx */,
+				2744E5EA0FC16BE200E85C33 /* Scintilla.framework */,
 			);
-			name = "Source Files";
+			name = Products;
 			sourceTree = "<group>";
 		};
 		29B97314FDCFA39411CA2CEA /* ScintillaTest */ = {
 			isa = PBXGroup;
 			children = (
-				27EDFCA80F85EA1800638A46 /* Scintilla */,
+				2744E5E20FC16BE200E85C33 /* ScintillaFramework.xcodeproj */,
 				080E96DDFE201D6D7F000001 /* Classes */,
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
-				272133490F9731CB006BE49A /* Scintilla-Info.plist */,
 			);
 			name = ScintillaTest;
 			sourceTree = "<group>";
@@ -576,9 +145,7 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				274CDFE50F9DBA4E00B64ADC /* TestData.sql */,
-				2721342C0F974971006BE49A /* mac_cursor_busy.png */,
-				2721342D0F974971006BE49A /* mac_cursor_flipped.png */,
+				2791F4480FC1A8E9009DBCF9 /* TestData.sql */,
 				8D1107310486CEB800E47090 /* Info.plist */,
 				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
 				1DDD58140DA1D0A300B32029 /* MainMenu.xib */,
@@ -597,36 +164,7 @@
 		};
 /* End PBXGroup section */
 
-/* Begin PBXHeadersBuildPhase section */
-		272133430F9731CB006BE49A /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				272133530F9732D2006BE49A /* ScintillaView.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
 /* Begin PBXNativeTarget section */
-		272133470F9731CB006BE49A /* Scintilla */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 2721334C0F9731CC006BE49A /* Build configuration list for PBXNativeTarget "Scintilla" */;
-			buildPhases = (
-				272133430F9731CB006BE49A /* Headers */,
-				272133440F9731CB006BE49A /* Resources */,
-				272133450F9731CB006BE49A /* Sources */,
-				272133460F9731CB006BE49A /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = Scintilla;
-			productName = Scintilla;
-			productReference = 272133480F9731CB006BE49A /* Scintilla.framework */;
-			productType = "com.apple.product-type.framework";
-		};
 		8D1107260486CEB800E47090 /* ScintillaTest */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "ScintillaTest" */;
@@ -639,7 +177,7 @@
 			buildRules = (
 			);
 			dependencies = (
-				272133C40F97361C006BE49A /* PBXTargetDependency */,
+				27AF7EC70FC2C36A007160EF /* PBXTargetDependency */,
 			);
 			name = ScintillaTest;
 			productInstallPath = "$(HOME)/Applications";
@@ -657,150 +195,43 @@
 			hasScannedForEncodings = 1;
 			mainGroup = 29B97314FDCFA39411CA2CEA /* ScintillaTest */;
 			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 2744E5E30FC16BE200E85C33 /* Products */;
+					ProjectRef = 2744E5E20FC16BE200E85C33 /* ScintillaFramework.xcodeproj */;
+				},
+			);
 			projectRoot = "";
 			targets = (
 				8D1107260486CEB800E47090 /* ScintillaTest */,
-				272133470F9731CB006BE49A /* Scintilla */,
 			);
 		};
 /* End PBXProject section */
 
+/* Begin PBXReferenceProxy section */
+		2744E5EA0FC16BE200E85C33 /* Scintilla.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = Scintilla.framework;
+			remoteRef = 2744E5E90FC16BE200E85C33 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
 /* Begin PBXResourcesBuildPhase section */
-		272133440F9731CB006BE49A /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2721342E0F974971006BE49A /* mac_cursor_busy.png in Resources */,
-				2721342F0F974971006BE49A /* mac_cursor_flipped.png in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		8D1107290486CEB800E47090 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
 				1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */,
-				274CDFE60F9DBA4E00B64ADC /* TestData.sql in Resources */,
+				2791F4490FC1A8E9009DBCF9 /* TestData.sql in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-		272133450F9731CB006BE49A /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				272133590F973324006BE49A /* ScintillaCocoa.mm in Sources */,
-				2721335A0F973324006BE49A /* AutoComplete.cxx in Sources */,
-				2721335B0F973324006BE49A /* CallTip.cxx in Sources */,
-				2721335C0F973324006BE49A /* CellBuffer.cxx in Sources */,
-				2721335D0F973324006BE49A /* CharClassify.cxx in Sources */,
-				2721335E0F973324006BE49A /* ContractionState.cxx in Sources */,
-				2721335F0F973324006BE49A /* Decoration.cxx in Sources */,
-				272133600F973324006BE49A /* Document.cxx in Sources */,
-				272133610F973324006BE49A /* DocumentAccessor.cxx in Sources */,
-				272133620F973324006BE49A /* Editor.cxx in Sources */,
-				272133630F973324006BE49A /* ExternalLexer.cxx in Sources */,
-				272133640F973324006BE49A /* Indicator.cxx in Sources */,
-				272133650F973324006BE49A /* KeyMap.cxx in Sources */,
-				272133660F973324006BE49A /* KeyWords.cxx in Sources */,
-				272133670F973324006BE49A /* LexCPP.cxx in Sources */,
-				272133680F973324006BE49A /* LexCSS.cxx in Sources */,
-				272133690F973324006BE49A /* LexHTML.cxx in Sources */,
-				2721336A0F973324006BE49A /* LexLua.cxx in Sources */,
-				2721336B0F973324006BE49A /* LexMSSQL.cxx in Sources */,
-				2721336C0F973324006BE49A /* LexMySQL.cxx in Sources */,
-				2721336D0F973324006BE49A /* LexPerl.cxx in Sources */,
-				2721336E0F973324006BE49A /* LexPython.cxx in Sources */,
-				2721336F0F973324006BE49A /* LexSQL.cxx in Sources */,
-				272133700F973324006BE49A /* LineMarker.cxx in Sources */,
-				272133710F973324006BE49A /* PositionCache.cxx in Sources */,
-				272133720F973324006BE49A /* PropSet.cxx in Sources */,
-				272133730F973324006BE49A /* RESearch.cxx in Sources */,
-				272133740F973324006BE49A /* RunStyles.cxx in Sources */,
-				272133750F973324006BE49A /* ScintillaBase.cxx in Sources */,
-				272133760F973324006BE49A /* Style.cxx in Sources */,
-				272133770F973324006BE49A /* StyleContext.cxx in Sources */,
-				272133780F973324006BE49A /* UniConversion.cxx in Sources */,
-				272133790F973324006BE49A /* ViewStyle.cxx in Sources */,
-				2721337A0F973324006BE49A /* WindowAccessor.cxx in Sources */,
-				2721337B0F973324006BE49A /* XPM.cxx in Sources */,
-				2721337C0F973324006BE49A /* LexBash.cxx in Sources */,
-				2721337D0F973324006BE49A /* PlatCocoa.mm in Sources */,
-				2721337E0F973324006BE49A /* ScintillaView.mm in Sources */,
-				271D1F9D0FA7236900FD601F /* LexAbaqus.cxx in Sources */,
-				271D1F9E0FA7236900FD601F /* LexAda.cxx in Sources */,
-				271D1F9F0FA7236900FD601F /* LexAPDL.cxx in Sources */,
-				271D1FA00FA7236900FD601F /* LexAsm.cxx in Sources */,
-				271D1FA10FA7236900FD601F /* LexAsn1.cxx in Sources */,
-				271D1FA20FA7236900FD601F /* LexASY.cxx in Sources */,
-				271D1FA30FA7236900FD601F /* LexAU3.cxx in Sources */,
-				271D1FA40FA7236900FD601F /* LexAVE.cxx in Sources */,
-				271D1FA50FA7236900FD601F /* LexBaan.cxx in Sources */,
-				271D1FA60FA7236900FD601F /* LexBasic.cxx in Sources */,
-				271D1FA70FA7236900FD601F /* LexBullant.cxx in Sources */,
-				271D1FA80FA7236900FD601F /* LexCaml.cxx in Sources */,
-				271D1FA90FA7236900FD601F /* LexCLW.cxx in Sources */,
-				271D1FAA0FA7236900FD601F /* LexCmake.cxx in Sources */,
-				271D1FAB0FA7236900FD601F /* LexCOBOL.cxx in Sources */,
-				271D1FAC0FA7236900FD601F /* LexConf.cxx in Sources */,
-				271D1FAD0FA7236900FD601F /* LexCrontab.cxx in Sources */,
-				271D1FAE0FA7236900FD601F /* LexCsound.cxx in Sources */,
-				271D1FAF0FA7236900FD601F /* LexD.cxx in Sources */,
-				271D1FB00FA7236900FD601F /* LexEiffel.cxx in Sources */,
-				271D1FB10FA7236900FD601F /* LexErlang.cxx in Sources */,
-				271D1FB20FA7236900FD601F /* LexEScript.cxx in Sources */,
-				271D1FB30FA7236900FD601F /* LexFlagship.cxx in Sources */,
-				271D1FB40FA7236900FD601F /* LexForth.cxx in Sources */,
-				271D1FB50FA7236900FD601F /* LexFortran.cxx in Sources */,
-				271D1FB60FA7236900FD601F /* LexGAP.cxx in Sources */,
-				271D1FB80FA7236900FD601F /* LexGui4Cli.cxx in Sources */,
-				271D1FB90FA7236900FD601F /* LexHaskell.cxx in Sources */,
-				271D1FBA0FA7236900FD601F /* LexInno.cxx in Sources */,
-				271D1FBB0FA7236900FD601F /* LexKix.cxx in Sources */,
-				271D1FBC0FA7236900FD601F /* LexLisp.cxx in Sources */,
-				271D1FBD0FA7236900FD601F /* LexLout.cxx in Sources */,
-				271D1FBE0FA7236900FD601F /* LexMagik.cxx in Sources */,
-				271D1FBF0FA7236900FD601F /* LexMatlab.cxx in Sources */,
-				271D1FC00FA7236900FD601F /* LexMetapost.cxx in Sources */,
-				271D1FC10FA7236900FD601F /* LexMMIXAL.cxx in Sources */,
-				271D1FC20FA7236900FD601F /* LexMPT.cxx in Sources */,
-				271D1FC30FA7236900FD601F /* LexNimrod.cxx in Sources */,
-				271D1FC40FA7236900FD601F /* LexNsis.cxx in Sources */,
-				271D1FC50FA7236900FD601F /* LexOpal.cxx in Sources */,
-				271D1FC60FA7236900FD601F /* LexOthers.cxx in Sources */,
-				271D1FC70FA7236900FD601F /* LexPascal.cxx in Sources */,
-				271D1FC80FA7236900FD601F /* LexPB.cxx in Sources */,
-				271D1FC90FA7236900FD601F /* LexPLM.cxx in Sources */,
-				271D1FCA0FA7236900FD601F /* LexPOV.cxx in Sources */,
-				271D1FCB0FA7236900FD601F /* LexPowerPro.cxx in Sources */,
-				271D1FCC0FA7236900FD601F /* LexPowerShell.cxx in Sources */,
-				271D1FCD0FA7236900FD601F /* LexProgress.cxx in Sources */,
-				271D1FCE0FA7236900FD601F /* LexPS.cxx in Sources */,
-				271D1FCF0FA7236900FD601F /* LexR.cxx in Sources */,
-				271D1FD00FA7236900FD601F /* LexRebol.cxx in Sources */,
-				271D1FD10FA7236900FD601F /* LexRuby.cxx in Sources */,
-				271D1FD20FA7236900FD601F /* LexScriptol.cxx in Sources */,
-				271D1FD30FA7236900FD601F /* LexSmalltalk.cxx in Sources */,
-				271D1FD40FA7236900FD601F /* LexSML.cxx in Sources */,
-				271D1FD50FA7236900FD601F /* LexSorcus.cxx in Sources */,
-				271D1FD60FA7236900FD601F /* LexSpecman.cxx in Sources */,
-				271D1FD70FA7236900FD601F /* LexSpice.cxx in Sources */,
-				271D1FD80FA7236900FD601F /* LexTACL.cxx in Sources */,
-				271D1FD90FA7236900FD601F /* LexTADS3.cxx in Sources */,
-				271D1FDA0FA7236900FD601F /* LexTAL.cxx in Sources */,
-				271D1FDB0FA7236900FD601F /* LexTCL.cxx in Sources */,
-				271D1FDC0FA7236900FD601F /* LexTeX.cxx in Sources */,
-				271D1FDD0FA7236900FD601F /* LexVB.cxx in Sources */,
-				271D1FDE0FA7236900FD601F /* LexVerilog.cxx in Sources */,
-				271D1FDF0FA7236900FD601F /* LexVHDL.cxx in Sources */,
-				271D1FE00FA7236900FD601F /* LexYAML.cxx in Sources */,
-				271D1FE10FA7236900FD601F /* PerLine.cxx in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		8D11072C0486CEB800E47090 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -813,10 +244,10 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		272133C40F97361C006BE49A /* PBXTargetDependency */ = {
+		27AF7EC70FC2C36A007160EF /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 272133470F9731CB006BE49A /* Scintilla */;
-			targetProxy = 272133C30F97361C006BE49A /* PBXContainerItemProxy */;
+			name = Scintilla;
+			targetProxy = 27AF7EC60FC2C36A007160EF /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
@@ -840,90 +271,29 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-		2721334A0F9731CB006BE49A /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				FRAMEWORK_VERSION = A;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = "";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					SCI_NAMESPACE,
-					SCI_LEXER,
-				);
-				INFOPLIST_FILE = "Scintilla-Info.plist";
-				INSTALL_PATH = "@executable_path/../Frameworks";
-				OTHER_LDFLAGS = (
-					"-framework",
-					Foundation,
-					"-framework",
-					AppKit,
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = Scintilla;
-			};
-			name = Debug;
-		};
-		2721334B0F9731CB006BE49A /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				FRAMEWORK_VERSION = A;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_MODEL_TUNING = G5;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = "";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					SCI_NAMESPACE,
-					SCI_LEXER,
-				);
-				INFOPLIST_FILE = "Scintilla-Info.plist";
-				INSTALL_PATH = "@executable_path/../Frameworks";
-				OTHER_LDFLAGS = (
-					"-framework",
-					Foundation,
-					"-framework",
-					AppKit,
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = Scintilla;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
 		C01FCF4B08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../../../../MySQL/Workbench/5.2/ext/scintilla/cocoa/ScintillaFramework/build/Debug\"",
+				);
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = ScintillaTest_Prefix.pch;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					SCI_NAMESPACE,
-					SCI_LEXER,
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = "";
+				HEADER_SEARCH_PATHS = "../..//**";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../SciTest/build/Development\"",
-				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = ScintillaTest;
+				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Debug;
 		};
@@ -932,20 +302,21 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../../../../MySQL/Workbench/5.2/ext/scintilla/cocoa/ScintillaFramework/build/Debug\"",
+				);
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = ScintillaTest_Prefix.pch;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					SCI_NAMESPACE,
-					SCI_LEXER,
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = "";
+				HEADER_SEARCH_PATHS = "../..//**";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../../SciTest/build/Development\"",
-				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = ScintillaTest;
+				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Release;
 		};
@@ -958,6 +329,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "";
 				PREBINDING = NO;
 				SDKROOT = macosx10.5;
 			};
@@ -970,6 +342,7 @@
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				OTHER_LDFLAGS = "";
 				PREBINDING = NO;
 				SDKROOT = macosx10.5;
 			};
@@ -978,15 +351,6 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		2721334C0F9731CC006BE49A /* Build configuration list for PBXNativeTarget "Scintilla" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				2721334A0F9731CB006BE49A /* Debug */,
-				2721334B0F9731CB006BE49A /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "ScintillaTest" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
diff --git a/cocoa/ScintillaView.h b/cocoa/ScintillaView.h
index b341dd225..41861226f 100644
--- a/cocoa/ScintillaView.h
+++ b/cocoa/ScintillaView.h
@@ -10,6 +10,11 @@
 
 #import <Cocoa/Cocoa.h>
 
+#import "Platform.h"
+#import "Scintilla.h"
+#import "SciLexer.h"
+
+#import "InfoBarCommunicator.h"
 #import "ScintillaCocoa.h"
 
 @class ScintillaView;
@@ -21,7 +26,7 @@
 @interface InnerView : NSView <NSTextInput>
 {
 @private
-  Scintilla::ScintillaView* mOwner;
+  ScintillaView* mOwner;
   NSCursor* mCurrentCursor;
   NSTrackingRectTag mCurrentTrackingRect;
 
@@ -38,7 +43,7 @@
 @property (retain) ScintillaView* owner;
 @end
 
-@interface ScintillaView : NSView
+@interface ScintillaView : NSView <InfoBarCommunicator>
 {
 @private
   // The back end is kind of a controller and model in one.
@@ -50,12 +55,20 @@
   
   NSScroller* mHorizontalScroller;
   NSScroller* mVerticalScroller;
+  
+  // Area to display additional controls (e.g. zoom info, caret position, status info).
+  NSView <InfoBarCommunicator>* mInfoBar;
+  BOOL mInfoBarAtTop;
+  int mInitialInfoBarWidth;
 }
 
 - (void) dealloc;
 - (void) layout;
 
 - (void) sendNotification: (NSString*) notificationName;
+- (void) notify: (NotificationType) type message: (NSString*) message location: (NSPoint) location
+          value: (float) value;
+- (void) setCallback: (id <InfoBarCommunicator>) callback;
 
 // Scroller handling
 - (BOOL) setVerticalScrollRange: (int) range page: (int) page;
@@ -71,9 +84,14 @@
 - (void) setString: (NSString*) aString;
 - (void) setEditable: (BOOL) editable;
 
+// Native call through to the backend.
++ (sptr_t) directCall: (ScintillaView*) sender message: (unsigned int) message wParam: (uptr_t) wParam
+               lParam: (sptr_t) lParam;
+
 // Back end properties getters and setters.
 - (void) setGeneralProperty: (int) property parameter: (long) parameter value: (long) value;
 - (long) getGeneralProperty: (int) property parameter: (long) parameter;
+- (long) getGeneralProperty: (int) property parameter: (long) parameter extra: (long) extra;
 - (void) setColorProperty: (int) property parameter: (long) parameter value: (NSColor*) value;
 - (void) setColorProperty: (int) property parameter: (long) parameter fromHTML: (NSString*) fromHTML;
 - (NSColor*) getColorProperty: (int) property parameter: (long) parameter;
@@ -84,6 +102,9 @@
 - (void) setLexerProperty: (NSString*) name value: (NSString*) value;
 - (NSString*) getLexerProperty: (NSString*) name;
 
+- (void) setInfoBar: (NSView <InfoBarCommunicator>*) aView top: (BOOL) top;
+- (void) setStatusText: (NSString*) text;
+
 @property Scintilla::ScintillaCocoa* backend;
 
 @end
diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index d6b353256..a7b7a502e 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -36,8 +36,8 @@ static NSCursor* waitCursor;
     mCurrentTrackingRect = 0;
     mMarkedTextRange = NSMakeRange(NSNotFound, 0);
     
-    [self registerForDraggedTypes:[NSArray arrayWithObjects:
-                                   NSStringPboardType, NSHTMLPboardType, NSFilenamesPboardType, nil]];
+    [self registerForDraggedTypes: [NSArray arrayWithObjects:
+                                   NSStringPboardType, ScintillaRecPboardType, NSFilenamesPboardType, nil]];
   }
   
   return self;
@@ -129,8 +129,9 @@ static NSCursor* waitCursor;
 //--------------------------------------------------------------------------------------------------
 
 /**
- * Windows uses a client coordinate system where the upper left corner is the origin in a window.
- * We have to adjust for that. However by returning YES here, we are already done with that.
+ * Windows uses a client coordinate system where the upper left corner is the origin in a window
+ * (and so does Scintilla). We have to adjust for that. However by returning YES here, we are 
+ * already done with that.
  * Note that because of returning YES here most coordinates we use now (e.g. for painting,
  * invalidating rectangles etc.) are given with +Y pointing down!
  */
@@ -194,7 +195,7 @@ static NSCursor* waitCursor;
 
 - (void) doCommandBySelector: (SEL) selector
 {
-  if ([self respondsToSelector:@selector(selector)])
+  if ([self respondsToSelector: @selector(selector)])
     [self performSelector: selector withObject: nil];
 }
 
@@ -489,6 +490,45 @@ static NSCursor* waitCursor;
   mOwner.backend->DraggingExited(sender);
 }
 
+//--------------------------------------------------------------------------------------------------
+
+// NSResponder actions.
+
+- (void) selectAll: (id) sender
+{
+  mOwner.backend->SelectAll();
+}
+
+- (void) deleteBackward: (id) sender
+{
+  mOwner.backend->DeleteBackward();
+}
+
+- (void) cut: (id) sender
+{
+  mOwner.backend->Cut();
+}
+
+- (void) copy: (id) sender
+{
+  mOwner.backend->Copy();
+}
+
+- (void) paste: (id) sender
+{
+  mOwner.backend->Paste();
+}
+
+- (void) undo: (id) sender
+{
+  mOwner.backend->Undo();
+}
+
+- (void) redo: (id) sender
+{
+  mOwner.backend->Redo();
+}
+
 @end
 
 //--------------------------------------------------------------------------------------------------
@@ -499,7 +539,8 @@ static NSCursor* waitCursor;
 
 /**
  * ScintiallView is a composite control made from an NSView and an embedded NSView that is
- * used as canvas for the output (by the backend, using its CGContext), plus two scrollers.
+ * used as canvas for the output (by the backend, using its CGContext), plus other elements
+ * (scrollers, info bar).
  */
 
 //--------------------------------------------------------------------------------------------------
@@ -537,6 +578,37 @@ static NSCursor* waitCursor;
 //--------------------------------------------------------------------------------------------------
 
 /**
+ * Called by a connected compontent (usually the info bar) if something changed there.
+ *
+ * @param type The type of the notification.
+ * @param message Carries the new status message if the type is a status message change.
+ * @param location Carries the new location (e.g. caret) if the type is a caret change or similar type.
+ * @param location Carries the new zoom value if the type is a zoom change.
+ */
+- (void) notify: (NotificationType) type message: (NSString*) message location: (NSPoint) location
+          value: (float) value
+{
+  switch (type)
+  {
+    case IBNZoomChanged:
+      // Compute point increase/decrease based on default font size.
+      int fontSize = [self getGeneralProperty: SCI_STYLEGETSIZE parameter: STYLE_DEFAULT];
+      int zoom = (int) (fontSize * (value - 1));
+      [self setGeneralProperty: SCI_SETZOOM parameter: zoom value: 0];
+      break;
+  };
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) setCallback: (id <InfoBarCommunicator>) callback
+{
+  // Not used. Only here to satisfy protocol.
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
  * Notification function used by Scintilla to call us back (e.g. for handling clicks on the 
  * folder margin or changes in the editor).
  */
@@ -568,6 +640,19 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa
           if (scn->modificationType & (SC_MOD_INSERTTEXT | SC_MOD_DELETETEXT))
             [editor sendNotification: NSTextDidChangeNotification];
           break;
+        case SCN_ZOOM:
+          // A zoom change happend. Notify info bar if there is one.
+          float zoom = [editor getGeneralProperty: SCI_GETZOOM parameter: 0];
+          int fontSize = [editor getGeneralProperty: SCI_STYLEGETSIZE parameter: STYLE_DEFAULT];
+          float factor = (zoom / fontSize) + 1;
+          [editor->mInfoBar notify: IBNZoomChanged message: nil location: NSZeroPoint value: factor];
+          break;
+        case SCN_UPDATEUI:
+          // Triggered whenever changes in the UI state need to be reflected.
+          // These can be: caret changes, selection changes etc.
+          NSPoint caretPosition = editor->mBackend->GetCaretPosition();
+          [editor->mInfoBar notify: IBNCaretChanged message: nil location: caretPosition value: 0];
+          break;
       }
       break;
     }
@@ -642,6 +727,7 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa
  */
 - (void) dealloc
 {
+  [mInfoBar release];
   delete mBackend;
   [super dealloc];
 }
@@ -661,16 +747,23 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa
 //--------------------------------------------------------------------------------------------------
 
 /**
- * Used to position and size the parts of the editor (content + scrollers).
+ * Used to position and size the parts of the editor (content, scrollers, info bar).
  */
 - (void) layout
 {
   int scrollerWidth = [NSScroller scrollerWidth];
 
   NSSize size = [self frame].size;
-  NSPoint hScrollerOrigin = {0, 0};
-  NSPoint vScrollerOrigin = {size.width - scrollerWidth, 0};
+  NSRect hScrollerRect = {0, 0, size.width, scrollerWidth};
+  NSRect vScrollerRect = {size.width - scrollerWidth, 0, scrollerWidth, size.height};
+  NSRect barFrame = {0, size.height - scrollerWidth, size.width, scrollerWidth};
+  BOOL infoBarVisible = mInfoBar != nil && ![mInfoBar isHidden];
+  
+  // Horizontal offset of the content. Almost always 0 unless the vertical scroller
+  // is on the left side.
+  int contentX = 0;
   
+  // Vertical scroller frame calculation.
   if (![mVerticalScroller isHidden])
   {
     // Consider user settings (left vs right vertical scrollbar).
@@ -678,27 +771,75 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa
                    isEqualToString: @"left"];
     if (isLeft)
     {
-      vScrollerOrigin.x = 0;
-      hScrollerOrigin.x = scrollerWidth;
+      vScrollerRect.origin.x = 0;
+      hScrollerRect.origin.x = scrollerWidth;
+      contentX = scrollerWidth;
     };
     
     size.width -= scrollerWidth;
+    hScrollerRect.size.width -= scrollerWidth;
   }
+  
+  // Same for horizontal scroller.
   if (![mHorizontalScroller isHidden])
   {
+    // Make room for the h-scroller.
     size.height -= scrollerWidth;
-    vScrollerOrigin.y += scrollerWidth;
+    vScrollerRect.size.height -= scrollerWidth;
+    vScrollerRect.origin.y += scrollerWidth;
   };
   
-  NSRect contentRect = {hScrollerOrigin.x, vScrollerOrigin.y, size.width, size.height};
+  // Info bar frame.
+  if (infoBarVisible)
+  {
+    // Initial value already is as if the bar is at top.
+    if (mInfoBarAtTop)
+    {
+      vScrollerRect.size.height -= scrollerWidth;
+      size.height -= scrollerWidth;
+    }
+    else
+    {
+      // Layout info bar and h-scroller side by side in a friendly manner.
+      int nativeWidth = mInitialInfoBarWidth;
+      int remainingWidth = barFrame.size.width;
+      
+      barFrame.origin.y = 0;
+
+      if ([mHorizontalScroller isHidden])
+      {
+        // H-scroller is not visible, so take the full space.
+        vScrollerRect.origin.y += scrollerWidth;
+        vScrollerRect.size.height -= scrollerWidth;
+        size.height -= scrollerWidth;
+      }
+      else
+      {
+        // If the left offset of the h-scroller is > 0 then the v-scroller is on the left side.
+        // In this case we take the full width, otherwise what has been given to the h-scroller 
+        // and content up to now.
+        if (hScrollerRect.origin.x == 0)
+          remainingWidth = size.width;
+
+        // Note: remainingWidth can become < 0, which hides the scroller.
+        remainingWidth -= nativeWidth;
+
+        hScrollerRect.origin.x = nativeWidth;
+        hScrollerRect.size.width = remainingWidth;
+        barFrame.size.width = nativeWidth;
+      }
+    }
+  }
+  
+  NSRect contentRect = {contentX, vScrollerRect.origin.y, size.width, size.height};
   [mContent setFrame: contentRect];
   
+  if (infoBarVisible)
+    [mInfoBar setFrame: barFrame];
   if (![mHorizontalScroller isHidden])
-    [mHorizontalScroller setFrame: NSMakeRect(hScrollerOrigin.x, hScrollerOrigin.y, size.width, 
-                                              scrollerWidth)];
+    [mHorizontalScroller setFrame: hScrollerRect];
   if (![mVerticalScroller isHidden])
-    [mVerticalScroller setFrame: NSMakeRect(vScrollerOrigin.x, vScrollerOrigin.y, scrollerWidth, 
-                                            size.height)];
+    [mVerticalScroller setFrame: vScrollerRect];
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -835,7 +976,7 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa
   
   char *buffer(0);
   const int length = mBackend->WndProc(SCI_GETLENGTH, 0, 0);
-  if ( length > 0 )
+  if (length > 0)
   {
     buffer = new char[length + 1];
     try
@@ -881,6 +1022,28 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa
   return mContent;
 }
 
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Direct call into the backend to allow uninterpreted access to it. The values to be passed in and
+ * the result heavily depend on the message that is used for the call. Refer to the Scintilla
+ * documentation to learn what can be used here.
+ */
++ (sptr_t) directCall: (ScintillaView*) sender message: (unsigned int) message wParam: (uptr_t) wParam
+               lParam: (sptr_t) lParam
+{
+  return ScintillaCocoa::DirectFunction(sender->mBackend, message, wParam, lParam);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * This is a helper method to set a property in the backend, with native parameters.
+ *
+ * @param property Main property like SCI_STYLESETFORE for which a value is to get.
+ * @param parameter Additional info for this property like a parameter or index.
+ * @param value The value to be set.
+ */
 - (void) setEditorProperty: (int) property wParam: (long) parameter lParam: (long) value
 {
   mBackend->WndProc(property, parameter, value);
@@ -932,6 +1095,17 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa
 //--------------------------------------------------------------------------------------------------
 
 /**
+ * Very similar to getGeneralProperty:parameter, but allows to specify an additional value
+ * which certain actions require.
+ */
+- (long) getGeneralProperty: (int) property parameter: (long) parameter extra: (long) extra
+{
+  return mBackend->WndProc(property, parameter, extra);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
  * Specialized property setter for colors.
  */
 - (void) setColorProperty: (int) property parameter: (long) parameter value: (NSColor*) value
@@ -1007,7 +1181,6 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa
   return result;
 }
 
-
 //--------------------------------------------------------------------------------------------------
 
 /**
@@ -1018,7 +1191,6 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa
   mBackend->WndProc(property, parameter, (sptr_t) value);
 }
 
-
 //--------------------------------------------------------------------------------------------------
 
 /**
@@ -1076,6 +1248,48 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa
   return [NSString stringWithUTF8String: result];
 }
 
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Sets the new control which is displayed as info bar at the top or bottom of the editor.
+ * Set newBar to nil if you want to hide the bar again.
+ * When aligned to bottom position then the info bar and the horizontal scroller share the available
+ * space. The info bar will then only get the width it is currently set to less a minimal amount
+ * reserved for the scroller. At the top position it gets the full width of the control.
+ * The info bar's height is set to the height of the scrollbar.
+ */
+- (void) setInfoBar: (NSView <InfoBarCommunicator>*) newBar top: (BOOL) top
+{
+  if (mInfoBar != newBar)
+  {
+    [mInfoBar removeFromSuperview];
+    
+    mInfoBar = newBar;
+    mInfoBarAtTop = top;
+    if (mInfoBar != nil)
+    {
+      [self addSubview: mInfoBar];
+      [mInfoBar setCallback: self];
+      
+      // Keep the initial width as reference for layout changes.
+      mInitialInfoBarWidth = [mInfoBar frame].size.width;
+    }
+    
+    [self layout];
+  }
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Sets the edit's info bar status message. This call only has an effect if there is an info bar.
+ */
+- (void) setStatusText: (NSString*) text
+{
+  if (mInfoBar != nil)
+    [mInfoBar notify: IBNStatusChanged message: text location: NSZeroPoint value: 0];
+}
+
 @end
 
 //--------------------------------------------------------------------------------------------------
author	nyamatongwe <devnull@localhost>	2009-06-26 06:22:21 +0000
committer	nyamatongwe <devnull@localhost>	2009-06-26 06:22:21 +0000
commit	20bf88ac8226b48883f744cc702926454f142d64 (patch)
tree	e8a7eb028667153470731d0e51c03e6e5f6e7c1f
parent	2f3029c7c2344fa0d950be945dd686b7cfc617c9 (diff)
download	scintilla-mirror-20bf88ac8226b48883f744cc702926454f142d64.tar.gz