From 374ca8d9fcdf464cd222c8d624d0be90946cc853 Mon Sep 17 00:00:00 2001
From: Merlijn Wajer <merlijn@wizzup.org>
Date: Sat, 19 Feb 2011 13:18:08 +0100
Subject: [PATCH] Simba: Completed USE_RUTIS compiler directives.

---
 Projects/Simba/simbaunit.pas   | 19 ++++++++++++-------
 Units/MMLAddon/mmlpsthread.pas |  5 +++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Projects/Simba/simbaunit.pas b/Projects/Simba/simbaunit.pas
index 4517f28..377bada 100644
--- a/Projects/Simba/simbaunit.pas
+++ b/Projects/Simba/simbaunit.pas
@@ -23,7 +23,7 @@
 unit SimbaUnit;
 
 {$undef EditButtons}
-{$define USE_RUTIS}
+//{$define USE_RUTIS}
 {$Undef ProcessMessages} //Define this for processmessages in ThreadSafeCall
 {$mode objfpc}{$H+}
 
@@ -461,7 +461,7 @@ type
     procedure SaveFormSettings;
     procedure LoadExtensions;
     procedure AddRecentFile(const filename : string);
-    procedure InitalizeTMThread(var Thread : TMThread);
+    procedure InitializeTMThread(var Thread : TMThread);
     procedure HandleParameters;
     procedure OnSaveScript(const Filename : string);
     property Interpreter : Integer read GetInterpreter  write SetInterpreter;
@@ -929,7 +929,7 @@ begin
       FormWritelnEx('The script hasn''t stopped yet, so we cannot start a new one.');
       exit;
     end;
-    InitalizeTMThread(scriptthread);
+    InitializeTMThread(scriptthread);
     ScriptThread.CompileOnly:= false;
     ScriptThread.OnTerminate:=@ScriptThreadTerminate;
     ScriptState:= ss_Running;
@@ -1446,11 +1446,10 @@ begin
     RecentFileItems[len - 1-i].Caption:= ExtractFileName(RecentFiles[i]);
 end;
 
-procedure TSimbaForm.InitalizeTMThread(var Thread: TMThread);
+procedure TSimbaForm.InitializeTMThread(var Thread: TMThread);
 var
   AppPath : string;
   ScriptPath : string;
-  UseCPascal: String;
   Script : string;
   Se: TMMLSettingsSandbox;
   loadFontsOnScriptStart: boolean;
@@ -1632,7 +1631,7 @@ procedure TSimbaForm.ActionCompileScriptExecute(Sender: TObject);
 var
   TempThread : TMThread;
 begin
-  InitalizeTMThread(TempThread);
+  InitializeTMThread(TempThread);
   TempThread.CompileOnly:= true;
   TempThread.Resume;
 end;
@@ -1810,7 +1809,9 @@ end;
 
 procedure TSimbaForm.ActionRUTISExecute(Sender: TObject);
 begin
+  {$IFDEF USE_RUTIS}
   Interpreter:= interp_RT;
+  {$ENDIF}
 end;
 
 procedure TSimbaForm.ActionSaveAllExecute(Sender: TObject);
@@ -2177,7 +2178,7 @@ begin
       sleep(25);
     end;
   end;
-  SimbaForm.InitalizeTMThread(t);
+  SimbaForm.InitializeTMThread(t);
   KillThread(t.ThreadID);
   if (t is TPSThread) then
   try
@@ -2299,6 +2300,10 @@ begin
   //Load the extensions
   LoadExtensions;
   UpdateTitle;
+
+  {$IFNDEF USE_RUTIS}
+  MenuItemRUTIS.Enabled:=False;
+  {$ENDIF}
   self.EndFormUpdate;
 
   if SettingsForm.Oops then
diff --git a/Units/MMLAddon/mmlpsthread.pas b/Units/MMLAddon/mmlpsthread.pas
index 6b9ecee..bc56167 100644
--- a/Units/MMLAddon/mmlpsthread.pas
+++ b/Units/MMLAddon/mmlpsthread.pas
@@ -24,7 +24,7 @@
 unit mmlpsthread;
 
 {$Define PS_USESSUPPORT}
-{$define USE_RUTIS}
+//{$define USE_RUTIS}
 {$mode objfpc}{$H+}
 
 interface
@@ -36,7 +36,8 @@ uses
   settings,settingssandbox, lcltype, dialogs
   {$IFDEF USE_RUTIS}
   ,Rutis_Engine,Rutis_Defs
-  {$ENDIF};
+  {$ENDIF}
+  ;
 
 const
   m_Status = 0; //Data = PChar to new status