Compile fix for latest LCL + you can now fold comments.

Projects/Simba/Simba.lpi

@@ -1,14 +1,12 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="9"/>
     <General>
       <Flags>
         <LRSInOutputDirectory Value="False"/>
       </Flags>
       <SessionStorage Value="InIDEConfig"/>
-      <MainUnit Value="0"/>
-      <TargetFileExt Value=""/>
       <Title Value="Simba"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
@@ -17,7 +15,7 @@
     <VersionInfo>
       <Language Value="0419"/>
       <CharSet Value="04B0"/>
-      <StringTable Comments="" CompanyName="" FileDescription="" FileVersion="0.0.0.0" InternalName="" LegalCopyright="" LegalTrademarks="" OriginalFilename="" ProductName="" ProductVersion=""/>
+      <StringTable ProductVersion=""/>
     </VersionInfo>
     <PublishOptions>
       <Version Value="2"/>
@@ -298,7 +296,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="9"/>
     <Target>
       <Filename Value="../../Simba"/>
     </Target>
@@ -307,6 +305,11 @@
       <OtherUnitFiles Value="$(ProjPath)/;$(ProjPath)../../Units/MMLCore/;$(ProjPath)../../Units/MMLAddon/;$(ProjPath)../../Units/PascalScript/;$(ProjPath)../../Units/Misc/;$(ProjPath)../../Units/MMLAddon/PSInc/;$(ProjPath)../../Units/Linux/;$(ProjPath)../../Units/Synapse/;$(LazarusDir)/components/mouseandkeyinput/"/>
       <UnitOutputDirectory Value="$(ProjPath)../../build/$(TargetOS)"/>
     </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
     <CodeGeneration>
       <Optimizations>
         <VariablesInRegisters Value="True"/>

Projects/Simba/framescript.lfm

@@ -52,6 +52,30 @@ object ScriptFrame: TScriptFrame
         Option = 0
         Priority = 0
       end>
+    RightGutter.Width = 0
+    RightGutter.MouseActions = <    
+      item
+        Shift = []
+        ShiftMask = []
+        Button = mbLeft
+        ClickCount = ccAny
+        ClickDir = cdDown
+        Command = 13
+        MoveCaret = False
+        Option = 0
+        Priority = 0
+      end    
+      item
+        Shift = []
+        ShiftMask = []
+        Button = mbRight
+        ClickCount = ccSingle
+        ClickDir = cdUp
+        Command = 12
+        MoveCaret = False
+        Option = 0
+        Priority = 0
+      end>
     Keystrokes = <    
       item
         Command = ecUp
@@ -600,7 +624,7 @@ object ScriptFrame: TScriptFrame
     OnStatusChange = SynEditStatusChange
     inline TSynGutterPartList
       object TSynGutterMarks
-        Width = 23
+        Width = 24
       end
       object TSynGutterLineNumber
         Width = 17
@@ -705,5 +729,7 @@ object ScriptFrame: TScriptFrame
           end>
       end
     end
+    inline SynRightGutterPartList1: TSynRightGutterPartList
+    end
   end
 end

Projects/Simba/framescript.pas

@@ -93,7 +93,7 @@ type
 
 implementation
 uses
-  SimbaUnit, MufasaTypes, SynEditTypes, LCLIntF, StrUtils,framefunctionlist;
+  SimbaUnit, MufasaTypes, SynEditTypes, SynEditHighlighterFoldBase, LCLIntF, StrUtils,framefunctionlist;
 
 function WordAtCaret(e: TSynEdit; var sp, ep: Integer; Start: Integer = -1; Offset: Integer = 0): string;
 var
@@ -496,7 +496,7 @@ begin
   {$ENDIF}
 
   if SimbaForm.CodeCompletionForm.Visible then
-    if (scAll in Changes) or (scTopLine in Changes) then
+    if {(scAll in Changes) or} (scTopLine in Changes) then
       SimbaForm.CodeCompletionForm.Hide
     else if (scCaretX in Changes) or (scCaretY in Changes) or (scSelection in Changes) or (scModified in Changes) then
     begin
@@ -597,8 +597,11 @@ begin
   end;
 end;
 constructor TScriptFrame.Create(TheOwner: TComponent);
+const
+  AdditionalFolds:TPascalCodeFoldBlockTypes = [cfbtSlashComment,cfbtBorCommand,cfbtAnsiComment];
 var
   MarkCaret : TSynEditMarkupHighlightAllCaret;
+  I : TPascalCodeFoldBlockType;
 begin
   inherited Create(TheOwner);
   SyncEdit := TSynPluginSyncroEdit.Create(SynEdit);
@@ -618,6 +621,10 @@ begin
   SynEdit.Highlighter := SimbaForm.CurrHighlighter;
   SynEdit.Options := SynEdit.Options + [eoTabIndent, eoKeepCaretX, eoDragDropEditing] - [eoSmartTabs];
   SynEdit.Options2 := SynEdit.Options2 + [eoCaretSkipsSelection];
+  SynEdit.Gutter.CodeFoldPart.MarkupInfo.Background:= clWhite;
+  for i := low(i) to high(i) do
+    if i in AdditionalFolds then
+      TSynCustomFoldHighlighter(SynEdit.Highlighter).FoldConfig[ord(i)].Enabled:= True;
   SynEdit.IncrementColor.Background := $30D070;
   SynEdit.HighlightAllColor.Background:= clYellow;
   SynEdit.HighlightAllColor.Foreground:= clDefault;

Projects/Simba/simbaunit.lfm

@@ -388,7 +388,7 @@ object SimbaForm: TSimbaForm
       end
       object LabeledEditSearch: TLabeledEdit
         Left = 104
-        Height = 23
+        Height = 21
         Top = 6
         Width = 80
         EditLabel.AnchorSideLeft.Control = LabeledEditSearch
@@ -396,10 +396,10 @@ object SimbaForm: TSimbaForm
         EditLabel.AnchorSideTop.Side = asrCenter
         EditLabel.AnchorSideRight.Control = LabeledEditSearch
         EditLabel.AnchorSideBottom.Control = LabeledEditSearch
-        EditLabel.Left = 71
+        EditLabel.Left = 73
-        EditLabel.Height = 16
+        EditLabel.Height = 14
         EditLabel.Top = 9
-        EditLabel.Width = 30
+        EditLabel.Width = 28
         EditLabel.Caption = 'Find: '
         EditLabel.ParentColor = False
         LabelPosition = lpLeft
@@ -412,9 +412,9 @@ object SimbaForm: TSimbaForm
       end
       object CheckBoxMatchCase: TCheckBox
         Left = 320
-        Height = 19
+        Height = 17
         Top = 7
-        Width = 80
+        Width = 72
         Caption = 'Match case'
         OnClick = CheckBoxMatchCaseClick
         TabOrder = 1
@@ -436,24 +436,20 @@ object SimbaForm: TSimbaForm
       OnEndDock = nil
       TabOrder = 3
       inherited FunctionList: TTreeView
-        Height = 319
+        Height = 323
-        Top = 20
         Width = 150
-        DefaultItemHeight = 17
         OnChange = FunctionListChange
         OnEnter = FunctionListEnter
         OnExit = FunctionListExit
       end
       inherited editSearchList: TEdit
-        Height = 23
+        Top = 341
-        Top = 339
         Width = 150
         OnExit = editSearchListExit
         OnKeyDown = editSearchListKeyDown
         OnKeyPress = editSearchListKeyPress
       end
       inherited FunctionListLabel: TLabel
-        Height = 16
         Width = 146
       end
     end
@@ -1263,7 +1259,7 @@ object SimbaForm: TSimbaForm
         OnClick = MenuItemFunctionListClick
       end
       object MenuItemExtensions: TMenuItem
-        Caption = '&Extensions'
+        Action = ActionExtensions
         OnClick = MenuItemExtensionsClick
       end
     end
@@ -2976,6 +2972,11 @@ object SimbaForm: TSimbaForm
       ImageIndex = 27
       OnExecute = ActionConsoleExecute
     end
+    object ActionExtensions: TAction
+      Caption = '&Extensions'
+      OnExecute = ActionExtensionsExecute
+      OnUpdate = ActionExtensionsUpdate
+    end
   end
   object DebugTimer: TTimer
     OnTimer = ProcessDebugStream