Some fixes for linux

git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@168 3f818213-9676-44b0-a9b4-5e4c4e03d09d

Projects/SAMufasaGUI/project1.lpi

@@ -7,7 +7,7 @@
       <TargetFileExt Value=""/>
       <Title Value="Mufasa Stand Alone"/>
       <UseXPManifest Value="True"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <ActiveEditorIndexAtStart Value="16"/>
     </General>
     <VersionInfo>
       <ProjectVersion Value=""/>
@@ -33,7 +33,7 @@
         <PackageName Value="LCL"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="183">
+    <Units Count="194">
       <Unit0>
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -168,8 +168,8 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="TestUnit"/>
-        <CursorPos X="3" Y="432"/>
-        <TopLine Value="419"/>
+        <CursorPos X="45" Y="751"/>
+        <TopLine Value="739"/>
         <EditorIndex Value="1"/>
         <UsageCount Value="202"/>
         <Loaded Value="True"/>
@@ -225,8 +225,8 @@
         <Filename Value="../../Units/MMLCore/client.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Client"/>
-        <CursorPos X="28" Y="34"/>
-        <TopLine Value="26"/>
+        <CursorPos X="87" Y="4"/>
+        <TopLine Value="1"/>
         <EditorIndex Value="0"/>
         <UsageCount Value="201"/>
         <Loaded Value="True"/>
@@ -310,26 +310,26 @@
         <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="mmlpsthread"/>
-        <CursorPos X="21" Y="184"/>
-        <TopLine Value="162"/>
-        <EditorIndex Value="12"/>
+        <CursorPos X="31" Y="188"/>
+        <TopLine Value="188"/>
+        <EditorIndex Value="14"/>
         <UsageCount Value="202"/>
         <Loaded Value="True"/>
       </Unit37>
       <Unit38>
         <Filename Value="../../Units/PascalScript/uPSComponent.pas"/>
         <UnitName Value="uPSComponent"/>
-        <CursorPos X="42" Y="625"/>
-        <TopLine Value="625"/>
+        <CursorPos X="12" Y="918"/>
+        <TopLine Value="903"/>
+        <EditorIndex Value="17"/>
         <UsageCount Value="38"/>
+        <Loaded Value="True"/>
       </Unit38>
       <Unit39>
         <Filename Value="../../../FPC/FPCCheckout/rtl/objpas/classes/classesh.inc"/>
         <CursorPos X="15" Y="268"/>
         <TopLine Value="240"/>
-        <EditorIndex Value="9"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit39>
       <Unit40>
         <Filename Value="../../../FPC/FPCCheckout/rtl/objpas/types.pp"/>
@@ -381,9 +381,11 @@
       </Unit46>
       <Unit47>
         <Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
-        <CursorPos X="73" Y="81"/>
-        <TopLine Value="63"/>
+        <CursorPos X="24" Y="75"/>
+        <TopLine Value="55"/>
+        <EditorIndex Value="15"/>
         <UsageCount Value="74"/>
+        <Loaded Value="True"/>
       </Unit47>
       <Unit48>
         <Filename Value="../../../FPC/FPCCheckout/rtl/win/tthread.inc"/>
@@ -468,10 +470,10 @@
       <Unit60>
         <Filename Value="../../../lazarus/lcl/lclintf.pas"/>
         <UnitName Value="LCLIntf"/>
-        <CursorPos X="10" Y="161"/>
-        <TopLine Value="150"/>
-        <EditorIndex Value="14"/>
-        <UsageCount Value="11"/>
+        <CursorPos X="26" Y="103"/>
+        <TopLine Value="91"/>
+        <EditorIndex Value="24"/>
+        <UsageCount Value="12"/>
         <Loaded Value="True"/>
       </Unit60>
       <Unit61>
@@ -574,9 +576,11 @@
       </Unit75>
       <Unit76>
         <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/other.inc"/>
-        <CursorPos X="11" Y="58"/>
-        <TopLine Value="1"/>
+        <CursorPos X="24" Y="31"/>
+        <TopLine Value="21"/>
+        <EditorIndex Value="16"/>
         <UsageCount Value="18"/>
+        <Loaded Value="True"/>
       </Unit76>
       <Unit77>
         <Filename Value="../../Units/PascalScript/uPSCompiler.pas"/>
@@ -606,9 +610,11 @@
       <Unit81>
         <Filename Value="../../Units/PascalScript/uPSRuntime.pas"/>
         <UnitName Value="uPSRuntime"/>
-        <CursorPos X="1" Y="5864"/>
-        <TopLine Value="5854"/>
+        <CursorPos X="29" Y="27"/>
+        <TopLine Value="15"/>
+        <EditorIndex Value="19"/>
         <UsageCount Value="17"/>
+        <Loaded Value="True"/>
       </Unit81>
       <Unit82>
         <Filename Value="../../Units/MMLAddon/plugins.pas"/>
@@ -671,18 +677,18 @@
       <Unit91>
         <Filename Value="../../../lazarus/lcl/controls.pp"/>
         <UnitName Value="Controls"/>
-        <CursorPos X="15" Y="1300"/>
-        <TopLine Value="1289"/>
-        <EditorIndex Value="2"/>
-        <UsageCount Value="13"/>
+        <CursorPos X="15" Y="1323"/>
+        <TopLine Value="1311"/>
+        <EditorIndex Value="5"/>
+        <UsageCount Value="14"/>
         <Loaded Value="True"/>
       </Unit91>
       <Unit92>
         <Filename Value="../../../lazarus/lcl/include/control.inc"/>
-        <CursorPos X="20" Y="77"/>
-        <TopLine Value="65"/>
-        <EditorIndex Value="3"/>
-        <UsageCount Value="10"/>
+        <CursorPos X="3" Y="1025"/>
+        <TopLine Value="1017"/>
+        <EditorIndex Value="6"/>
+        <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit92>
       <Unit93>
@@ -712,7 +718,7 @@
         <UnitName Value="dtm"/>
         <CursorPos X="34" Y="141"/>
         <TopLine Value="113"/>
-        <UsageCount Value="199"/>
+        <UsageCount Value="200"/>
       </Unit96>
       <Unit97>
         <Filename Value="../../../cogat/Units/CogatUnits/comppicker.pas"/>
@@ -727,7 +733,7 @@
         <UnitName Value="colourpicker"/>
         <CursorPos X="26" Y="198"/>
         <TopLine Value="191"/>
-        <UsageCount Value="195"/>
+        <UsageCount Value="197"/>
       </Unit98>
       <Unit99>
         <Filename Value="../../../cogat/Units/CogatUnits/compdragger.pas"/>
@@ -752,7 +758,7 @@
         <UnitName Value="windowselector"/>
         <CursorPos X="32" Y="12"/>
         <TopLine Value="31"/>
-        <UsageCount Value="185"/>
+        <UsageCount Value="187"/>
       </Unit101>
       <Unit102>
         <Filename Value="../../../usr/lib64/fpc/2.2.4/source/rtl/objpas/classes/classesh.inc"/>
@@ -786,7 +792,7 @@
         <UnitName Value="dtmutil"/>
         <CursorPos X="32" Y="18"/>
         <TopLine Value="1"/>
-        <UsageCount Value="172"/>
+        <UsageCount Value="174"/>
       </Unit106>
       <Unit107>
         <Filename Value="../../../cogat/Units/CogatUnits/compmaths.pas"/>
@@ -828,7 +834,7 @@
         <UnitName Value="mmath"/>
         <CursorPos X="32" Y="42"/>
         <TopLine Value="16"/>
-        <UsageCount Value="152"/>
+        <UsageCount Value="154"/>
       </Unit112>
       <Unit113>
         <Filename Value="../../../Documents/fpc/rtl/objpas/types.pp"/>
@@ -864,7 +870,7 @@
         <UnitName Value="ocr"/>
         <CursorPos X="43" Y="42"/>
         <TopLine Value="5"/>
-        <UsageCount Value="122"/>
+        <UsageCount Value="124"/>
       </Unit117>
       <Unit118>
         <Filename Value="../../Units/PascalScript/uPSR_extctrls.pas"/>
@@ -879,7 +885,7 @@
         <UnitName Value="project"/>
         <CursorPos X="46" Y="15"/>
         <TopLine Value="1"/>
-        <UsageCount Value="119"/>
+        <UsageCount Value="121"/>
       </Unit119>
       <Unit120>
         <Filename Value="../../../FPC/FPCCheckout/rtl/inc/heap.inc"/>
@@ -970,9 +976,9 @@
         <Filename Value="../../../lazarus/lcl/comctrls.pp"/>
         <UnitName Value="ComCtrls"/>
         <CursorPos X="22" Y="260"/>
-        <TopLine Value="232"/>
-        <EditorIndex Value="4"/>
-        <UsageCount Value="23"/>
+        <TopLine Value="234"/>
+        <EditorIndex Value="7"/>
+        <UsageCount Value="24"/>
         <Loaded Value="True"/>
       </Unit134>
       <Unit135>
@@ -985,9 +991,11 @@
       <Unit136>
         <Filename Value="../../Units/PascalScript/uPSDebugger.pas"/>
         <UnitName Value="uPSDebugger"/>
-        <CursorPos X="3" Y="450"/>
-        <TopLine Value="450"/>
+        <CursorPos X="13" Y="627"/>
+        <TopLine Value="624"/>
+        <EditorIndex Value="18"/>
         <UsageCount Value="17"/>
+        <Loaded Value="True"/>
       </Unit136>
       <Unit137>
         <Filename Value="../../Units/MMLCore/web.pas"/>
@@ -995,7 +1003,7 @@
         <UnitName Value="web"/>
         <CursorPos X="90" Y="16"/>
         <TopLine Value="1"/>
-        <UsageCount Value="47"/>
+        <UsageCount Value="49"/>
       </Unit137>
       <Unit138>
         <Filename Value="../../../lazarus/lcl/lazhelphtml.pas"/>
@@ -1194,10 +1202,10 @@
         <ComponentName Value="ScriptFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="framescript"/>
-        <CursorPos X="23" Y="61"/>
-        <TopLine Value="53"/>
-        <EditorIndex Value="11"/>
-        <UsageCount Value="40"/>
+        <CursorPos X="27" Y="61"/>
+        <TopLine Value="49"/>
+        <EditorIndex Value="13"/>
+        <UsageCount Value="42"/>
         <Loaded Value="True"/>
       </Unit162>
       <Unit163>
@@ -1215,18 +1223,18 @@
       <Unit165>
         <Filename Value="../../../lazarus/lcl/extctrls.pp"/>
         <UnitName Value="ExtCtrls"/>
-        <CursorPos X="15" Y="170"/>
-        <TopLine Value="142"/>
-        <EditorIndex Value="5"/>
-        <UsageCount Value="14"/>
+        <CursorPos X="14" Y="207"/>
+        <TopLine Value="195"/>
+        <EditorIndex Value="8"/>
+        <UsageCount Value="15"/>
         <Loaded Value="True"/>
       </Unit165>
       <Unit166>
         <Filename Value="../../../lazarus/lcl/include/customnotebook.inc"/>
-        <CursorPos X="3" Y="519"/>
-        <TopLine Value="514"/>
-        <EditorIndex Value="6"/>
-        <UsageCount Value="14"/>
+        <CursorPos X="56" Y="307"/>
+        <TopLine Value="296"/>
+        <EditorIndex Value="9"/>
+        <UsageCount Value="15"/>
         <Loaded Value="True"/>
       </Unit166>
       <Unit167>
@@ -1298,16 +1306,16 @@
         <UnitName Value="LMessages"/>
         <CursorPos X="11" Y="429"/>
         <TopLine Value="429"/>
-        <EditorIndex Value="13"/>
-        <UsageCount Value="11"/>
+        <EditorIndex Value="23"/>
+        <UsageCount Value="12"/>
         <Loaded Value="True"/>
       </Unit176>
       <Unit177>
         <Filename Value="../../../lazarus/lcl/include/customactionlist.inc"/>
         <CursorPos X="29" Y="151"/>
         <TopLine Value="136"/>
-        <EditorIndex Value="15"/>
-        <UsageCount Value="11"/>
+        <EditorIndex Value="27"/>
+        <UsageCount Value="12"/>
         <Loaded Value="True"/>
       </Unit177>
       <Unit178>
@@ -1315,163 +1323,249 @@
         <UnitName Value="ActnList"/>
         <CursorPos X="14" Y="188"/>
         <TopLine Value="166"/>
-        <EditorIndex Value="16"/>
-        <UsageCount Value="11"/>
+        <EditorIndex Value="28"/>
+        <UsageCount Value="12"/>
         <Loaded Value="True"/>
       </Unit178>
       <Unit179>
         <Filename Value="../../../lazarus/lcl/include/customaction.inc"/>
         <CursorPos X="3" Y="247"/>
         <TopLine Value="245"/>
-        <EditorIndex Value="17"/>
-        <UsageCount Value="11"/>
+        <EditorIndex Value="29"/>
+        <UsageCount Value="12"/>
         <Loaded Value="True"/>
       </Unit179>
       <Unit180>
         <Filename Value="../../../FPC/FPCCheckout/rtl/objpas/classes/lists.inc"/>
         <CursorPos X="3" Y="626"/>
         <TopLine Value="624"/>
-        <EditorIndex Value="10"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit180>
       <Unit181>
         <Filename Value="../../../lazarus/lcl/include/tabsheet.inc"/>
         <CursorPos X="11" Y="46"/>
-        <TopLine Value="13"/>
-        <EditorIndex Value="8"/>
-        <UsageCount Value="10"/>
+        <TopLine Value="20"/>
+        <EditorIndex Value="12"/>
+        <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit181>
       <Unit182>
         <Filename Value="../../../lazarus/lcl/include/custompage.inc"/>
         <CursorPos X="34" Y="177"/>
         <TopLine Value="174"/>
-        <EditorIndex Value="7"/>
-        <UsageCount Value="10"/>
+        <EditorIndex Value="11"/>
+        <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit182>
+      <Unit183>
+        <Filename Value="../../../fpc/rtl/inc/threadh.inc"/>
+        <CursorPos X="11" Y="135"/>
+        <TopLine Value="139"/>
+        <EditorIndex Value="3"/>
+        <UsageCount Value="11"/>
+        <Loaded Value="True"/>
+      </Unit183>
+      <Unit184>
+        <Filename Value="../../../fpc/rtl/inc/thread.inc"/>
+        <CursorPos X="28" Y="155"/>
+        <TopLine Value="152"/>
+        <EditorIndex Value="4"/>
+        <UsageCount Value="11"/>
+        <Loaded Value="True"/>
+      </Unit184>
+      <Unit185>
+        <Filename Value="../../../lazarus/lcl/widgetset/wsextctrls.pp"/>
+        <UnitName Value="WSExtCtrls"/>
+        <CursorPos X="50" Y="292"/>
+        <TopLine Value="292"/>
+        <UsageCount Value="10"/>
+      </Unit185>
+      <Unit186>
+        <Filename Value="../../../lazarus/lcl/interfaces/cocoa/cocoawsextctrls.pas"/>
+        <UnitName Value="CocoaWSExtCtrls"/>
+        <CursorPos X="22" Y="72"/>
+        <TopLine Value="59"/>
+        <UsageCount Value="10"/>
+      </Unit186>
+      <Unit187>
+        <Filename Value="../../../lazarus/lcl/interfaces/gtk/gtkwsextctrls.pp"/>
+        <UnitName Value="GtkWSExtCtrls"/>
+        <CursorPos X="67" Y="557"/>
+        <TopLine Value="569"/>
+        <EditorIndex Value="10"/>
+        <UsageCount Value="11"/>
+        <Loaded Value="True"/>
+      </Unit187>
+      <Unit188>
+        <Filename Value="../../../fpc/rtl/inc/objpash.inc"/>
+        <CursorPos X="21" Y="184"/>
+        <TopLine Value="172"/>
+        <EditorIndex Value="2"/>
+        <UsageCount Value="11"/>
+        <Loaded Value="True"/>
+      </Unit188>
+      <Unit189>
+        <Filename Value="../../../fpc/rtl/objpas/sysutils/osutilsh.inc"/>
+        <CursorPos X="11" Y="25"/>
+        <TopLine Value="13"/>
+        <EditorIndex Value="20"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit189>
+      <Unit190>
+        <Filename Value="../../../fpc/rtl/unix/sysutils.pp"/>
+        <UnitName Value="sysutils"/>
+        <CursorPos X="3" Y="1075"/>
+        <TopLine Value="1069"/>
+        <EditorIndex Value="21"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit190>
+      <Unit191>
+        <Filename Value="../../../fpc/rtl/unix/bunxh.inc"/>
+        <CursorPos X="13" Y="81"/>
+        <TopLine Value="78"/>
+        <EditorIndex Value="22"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit191>
+      <Unit192>
+        <Filename Value="../../../fpc/rtl/objpas/sysutils/datih.inc"/>
+        <CursorPos X="11" Y="179"/>
+        <TopLine Value="158"/>
+        <EditorIndex Value="25"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit192>
+      <Unit193>
+        <Filename Value="../../../fpc/rtl/objpas/sysutils/dati.inc"/>
+        <CursorPos X="12" Y="258"/>
+        <TopLine Value="254"/>
+        <EditorIndex Value="26"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit193>
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="477" Column="14" TopLine="474"/>
+        <Filename Value="../../Units/PascalScript/uPSComponent.pas"/>
+        <Caret Line="877" Column="22" TopLine="865"/>
       </Position1>
       <Position2>
-        <Filename Value="framescript.pas"/>
-        <Caret Line="61" Column="23" TopLine="53"/>
+        <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/other.inc"/>
+        <Caret Line="26" Column="37" TopLine="12"/>
       </Position2>
       <Position3>
-        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="44" Column="22" TopLine="35"/>
+        <Filename Value="../../Units/PascalScript/uPSRuntime.pas"/>
+        <Caret Line="744" Column="39" TopLine="732"/>
       </Position3>
       <Position4>
-        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="60" Column="29" TopLine="49"/>
+        <Filename Value="../../Units/PascalScript/uPSRuntime.pas"/>
+        <Caret Line="638" Column="21" TopLine="626"/>
       </Position4>
       <Position5>
-        <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="163" Column="42" TopLine="143"/>
+        <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/other.inc"/>
+        <Caret Line="26" Column="27" TopLine="12"/>
       </Position5>
       <Position6>
         <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
-        <Caret Line="4" Column="64" TopLine="1"/>
+        <Caret Line="68" Column="23" TopLine="56"/>
       </Position6>
       <Position7>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="5" Column="49" TopLine="82"/>
+        <Filename Value="../../Units/PascalScript/uPSComponent.pas"/>
+        <Caret Line="103" Column="3" TopLine="91"/>
       </Position7>
       <Position8>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="473" Column="15" TopLine="471"/>
+        <Filename Value="../../Units/PascalScript/uPSComponent.pas"/>
+        <Caret Line="918" Column="14" TopLine="915"/>
       </Position8>
       <Position9>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="275" Column="19" TopLine="258"/>
+        <Filename Value="../../Units/PascalScript/uPSDebugger.pas"/>
+        <Caret Line="627" Column="15" TopLine="624"/>
       </Position9>
       <Position10>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="5" Column="67" TopLine="1"/>
+        <Filename Value="../../Units/PascalScript/uPSRuntime.pas"/>
+        <Caret Line="6933" Column="20" TopLine="6930"/>
       </Position10>
       <Position11>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="364" Column="64" TopLine="358"/>
+        <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/other.inc"/>
+        <Caret Line="26" Column="32" TopLine="12"/>
       </Position11>
       <Position12>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="744" Column="31" TopLine="735"/>
+        <Filename Value="../../Units/PascalScript/uPSComponent.pas"/>
+        <Caret Line="205" Column="39" TopLine="193"/>
       </Position12>
       <Position13>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="763" Column="1" TopLine="741"/>
+        <Filename Value="../../Units/PascalScript/uPSComponent.pas"/>
+        <Caret Line="110" Column="5" TopLine="98"/>
       </Position13>
       <Position14>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="42" Column="141" TopLine="38"/>
+        <Filename Value="../../Units/PascalScript/uPSComponent.pas"/>
+        <Caret Line="918" Column="12" TopLine="903"/>
       </Position14>
       <Position15>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="713" Column="7" TopLine="711"/>
+        <Filename Value="../../Units/PascalScript/uPSDebugger.pas"/>
+        <Caret Line="627" Column="13" TopLine="624"/>
       </Position15>
       <Position16>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="113" Column="125" TopLine="104"/>
+        <Filename Value="../../Units/PascalScript/uPSRuntime.pas"/>
+        <Caret Line="6933" Column="21" TopLine="6930"/>
       </Position16>
       <Position17>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="753" Column="1" TopLine="732"/>
+        <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/other.inc"/>
+        <Caret Line="31" Column="4" TopLine="12"/>
       </Position17>
       <Position18>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="747" Column="15" TopLine="721"/>
+        <Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
+        <Caret Line="76" Column="28" TopLine="64"/>
       </Position18>
       <Position19>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="752" Column="49" TopLine="721"/>
+        <Filename Value="../../../lazarus/lcl/lclintf.pas"/>
+        <Caret Line="103" Column="26" TopLine="91"/>
       </Position19>
       <Position20>
-        <Filename Value="../../../lazarus/lcl/comctrls.pp"/>
-        <Caret Line="234" Column="57" TopLine="206"/>
+        <Filename Value="../../../fpc/rtl/objpas/sysutils/dati.inc"/>
+        <Caret Line="258" Column="12" TopLine="254"/>
       </Position20>
       <Position21>
-        <Filename Value="../../../lazarus/lcl/include/tabsheet.inc"/>
-        <Caret Line="46" Column="11" TopLine="13"/>
+        <Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
+        <Caret Line="75" Column="24" TopLine="55"/>
       </Position21>
       <Position22>
-        <Filename Value="../../../lazarus/lcl/comctrls.pp"/>
-        <Caret Line="260" Column="22" TopLine="232"/>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="313" Column="44" TopLine="305"/>
       </Position22>
       <Position23>
-        <Filename Value="../../../lazarus/lcl/extctrls.pp"/>
-        <Caret Line="83" Column="64" TopLine="55"/>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="518" Column="15" TopLine="516"/>
       </Position23>
       <Position24>
-        <Filename Value="../../../lazarus/lcl/include/custompage.inc"/>
-        <Caret Line="177" Column="34" TopLine="174"/>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="321" Column="20" TopLine="305"/>
       </Position24>
       <Position25>
         <Filename Value="testunit.pas"/>
-        <Caret Line="733" Column="115" TopLine="721"/>
+        <Caret Line="249" Column="93" TopLine="246"/>
       </Position25>
       <Position26>
         <Filename Value="testunit.pas"/>
-        <Caret Line="761" Column="21" TopLine="758"/>
+        <Caret Line="765" Column="33" TopLine="807"/>
       </Position26>
       <Position27>
         <Filename Value="testunit.pas"/>
-        <Caret Line="767" Column="12" TopLine="761"/>
+        <Caret Line="751" Column="45" TopLine="730"/>
       </Position27>
       <Position28>
         <Filename Value="testunit.pas"/>
-        <Caret Line="756" Column="3" TopLine="740"/>
+        <Caret Line="7" Column="97" TopLine="1"/>
       </Position28>
       <Position29>
         <Filename Value="testunit.pas"/>
-        <Caret Line="745" Column="16" TopLine="729"/>
+        <Caret Line="736" Column="47" TopLine="724"/>
       </Position29>
       <Position30>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="713" Column="9" TopLine="711"/>
+        <Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
+        <Caret Line="75" Column="24" TopLine="55"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>

Projects/SAMufasaGUI/testunit.lfm

@@ -1,10 +1,11 @@
 object Form1: TForm1
-  Left = 229
+  Left = 278
   Height = 553
-  Top = 78
+  Top = 235
   Width = 723
+  ActiveControl = PageControl1
   Caption = 'Action1'
-  ClientHeight = 533
+  ClientHeight = 528
   ClientWidth = 723
   Menu = MainMenu1
   OnClose = FormClose
@@ -60,7 +61,6 @@ object Form1: TForm1
       Left = 191
       Top = 2
       Action = ActionCloseTab
-      Caption = 'TB_CloseTab'
     end
     object ToolButton4: TToolButton
       Left = 214
@@ -157,8 +157,8 @@ object Form1: TForm1
   end
   object StatusBar: TStatusBar
     Left = 0
-    Height = 23
-    Top = 510
+    Height = 21
+    Top = 507
     Width = 723
     Panels = <    
       item
@@ -175,17 +175,17 @@ object Form1: TForm1
   end
   object PanelMemo: TPanel
     Left = 0
-    Height = 150
+    Height = 147
     Top = 360
     Width = 723
     Align = alBottom
     Anchors = [akTop, akLeft, akRight, akBottom]
-    ClientHeight = 150
+    ClientHeight = 147
     ClientWidth = 723
     TabOrder = 2
     object Memo1: TMemo
       Left = 1
-      Height = 148
+      Height = 145
       Top = 1
       Width = 721
       Align = alClient

Projects/SAMufasaGUI/testunit.pas

@@ -310,7 +310,7 @@ begin
       ss_Stopping:
         begin    //Terminate the thread the tough way.
           writeln('Terminating the Scriptthread');
-          KillThread(ScriptThread.Handle);
+          Writeln('Exit code terminate: ' +inttostr(KillThread(ScriptThread.Handle)));
           ScriptThread.Free;
           ScriptState := ss_None;
         end;
@@ -734,6 +734,11 @@ procedure TForm1.PageControl1ContextPopup(Sender: TObject; MousePos: TPoint;
   var Handled: Boolean);
 begin
   PopupTab := PageControl1.TabIndexAtClientPos(MousePos);
+  if PopupTab = -1 then
+  begin
+    Writeln('We couldn''t find which tab you clicked on, closing the popup');
+    Handled := true;
+  end;
 end;
 
 procedure TForm1.PageControl1DragDrop(Sender, Source: TObject; X, Y: Integer);
@@ -745,10 +750,10 @@ begin
     exit;
   NewPos := PageControl1.TabIndexAtClientPos(Point(x,y));
   OldPos := PageControl1.TabIndex;
-  if NewPos <> OldPos then
+  if (NewPos <> OldPos) and (NewPos <> -1) then
   begin;
     Tabs.Move(OldPos,NewPos);
-    PageControl1.Pages[PageControl1.TabIndex].TabIndex:= PageControl1.TabIndexAtClientPos(Point(x,y));
+    PageControl1.Pages[OldPos].TabIndex:= NewPos;
   end;
 end;
 
@@ -762,7 +767,7 @@ end;
 procedure TForm1.PageControl1MouseDown(Sender: TObject; Button: TMouseButton;
   Shift: TShiftState; X, Y: Integer);
 begin
-  PageControl1.BeginDrag(False);
+  PageControl1.BeginDrag(false);
 end;
 
 

Units/MMLAddon/PSInc/Wrappers/other.inc

@@ -21,10 +21,24 @@
     Other.inc for the Mufasa Macro Library
 }
 
-procedure Wait(t: Integer);
+procedure psWait(t: Integer);
+{$ifdef MSWINDOWS}
 begin
   Sleep(t);
 end;
+{$else}
+var
+  EndTime : integer;
+begin
+  if t > 50 then
+  begin;
+    EndTime := GetTickCount + t;
+    while (CurrThread.PSScript.Exec.Status = isRunning) and (GetTickCount < EndTime) do
+      Sleep(16);
+  end else
+    sleep(t);
+end;
+{$endif}
 
 procedure SaveScreenshot(FileName: string);
 var

Units/MMLAddon/PSInc/pscompile.inc

@@ -72,7 +72,7 @@ Sender.AddFunction(@SetTargetArray, 'procedure SetTargetArray(P: Integer; Size:
 
 {other}
 Sender.AddFunction(@SaveScreenshot,'procedure SaveScreenshot(FileName: string);');
-Sender.AddFunction(@Wait, 'procedure wait(t: integer);');
+Sender.AddFunction(@psWait, 'procedure wait(t: integer);');
 Sender.AddFunction(@GetTickCount, 'function GetSystemTime: Integer;');
 Sender.AddFunction(@CreateForm,'function CreateForm : TForm;');
 Sender.AddFunction(@CreateButton,'function CreateButton(Owner : TComponent) : TButton');

Units/MMLAddon/mmlpsthread.pas

@@ -57,7 +57,6 @@ type
       PluginsToload : Array of integer;
       FOnError  : TOnError;
       procedure OnCompile(Sender: TPSScript);
-      procedure AfterExecute(Sender : TPSScript);
       function RequireFile(Sender: TObject; const OriginFileName: String;
                           var FileName, OutPut: string): Boolean;
       procedure OnCompImport(Sender: TObject; x: TPSPascalCompiler);
@@ -160,7 +159,6 @@ begin
   PSScript.OnCompile:= @OnCompile;
   PSScript.OnCompImport:= @OnCompImport;
   PSScript.OnExecImport:= @OnExecImport;
-  PSScript.OnAfterExecute:= @AfterExecute;
   OnError:= nil;
   // Set some defines
   {$I PSInc/psdefines.inc}
@@ -188,7 +186,6 @@ end;
 {$I PSInc/Wrappers/other.inc}
 {$I PSInc/Wrappers/bitmap.inc}
 {$I PSInc/Wrappers/window.inc}
-
 {$I PSInc/Wrappers/colour.inc}
 {$I PSInc/Wrappers/math.inc}
 {$I PSInc/Wrappers/mouse.inc}
@@ -237,12 +234,6 @@ begin
   {$I PSInc/pscompile.inc}
 end;
 
-procedure TMMLPSThread.AfterExecute(Sender: TPSScript);
-begin
-  //Here we add all the Script-freeing-leftovers (like BMParray etc)
-  // ^ This will all be done with Client.Destroy;
-end;
-
 function TMMLPSThread.RequireFile(Sender: TObject;
   const OriginFileName: String; var FileName, OutPut: string): Boolean;
 var