From 229cdd6886a238fd309ab82270ac1bdb220e4413 Mon Sep 17 00:00:00 2001
From: Raymond <Raymond@.(none)>
Date: Tue, 11 May 2010 19:04:35 +0200
Subject: [PATCH] Fixed bug in freeing, Simba was freeing an already freed
 component!

---
 Projects/Simba/bitmapconv.lfm  | 25 +++++++++++++++++++------
 Projects/Simba/bitmapconv.pas  | 13 ++++++++++++-
 Projects/Simba/framescript.lfm |  1 -
 Projects/Simba/framescript.pas |  6 ------
 Projects/Simba/simbaunit.lfm   |  8 ++++++--
 Projects/Simba/simbaunit.pas   | 16 ++++++++++++++--
 6 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/Projects/Simba/bitmapconv.lfm b/Projects/Simba/bitmapconv.lfm
index f9c9695..66f8458 100644
--- a/Projects/Simba/bitmapconv.lfm
+++ b/Projects/Simba/bitmapconv.lfm
@@ -8,19 +8,32 @@ object BitmapConvForm: TBitmapConvForm
   ClientWidth = 320
   LCLVersion = '0.9.29'
   object Button1: TButton
-    Left = 144
-    Height = 52
-    Top = 152
-    Width = 105
+    Left = 192
+    Height = 36
+    Top = 184
+    Width = 113
     Caption = 'Button1'
     TabOrder = 0
   end
   object CheckBox1: TCheckBox
-    Left = 24
+    Left = 224
     Height = 17
-    Top = 160
+    Top = 152
     Width = 71
     Caption = 'CheckBox1'
     TabOrder = 1
   end
+  object Button2: TButton
+    Left = 12
+    Height = 36
+    Top = 184
+    Width = 90
+    Caption = 'Open'
+    OnClick = Button2Click
+    TabOrder = 2
+  end
+  object OpenPictureDialog1: TOpenPictureDialog
+    left = 128
+    top = 184
+  end
 end
diff --git a/Projects/Simba/bitmapconv.pas b/Projects/Simba/bitmapconv.pas
index 65fb6ff..f05f0e4 100644
--- a/Projects/Simba/bitmapconv.pas
+++ b/Projects/Simba/bitmapconv.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls;
+  StdCtrls, EditBtn, ExtDlgs;
 
 type
 
@@ -14,7 +14,10 @@ type
 
   TBitmapConvForm = class(TForm)
     Button1: TButton;
+    Button2: TButton;
     CheckBox1: TCheckBox;
+    OpenPictureDialog1: TOpenPictureDialog;
+    procedure Button2Click(Sender: TObject);
   private
     { private declarations }
   public
@@ -28,5 +31,13 @@ implementation
 
 {$R *.lfm}
 
+{ TBitmapConvForm }
+
+procedure TBitmapConvForm.Button2Click(Sender: TObject);
+begin
+  if OpenPictureDialog1.Execute then
+    writeln(OpenPictureDialog1.FileName);
+end;
+
 end.
 
diff --git a/Projects/Simba/framescript.lfm b/Projects/Simba/framescript.lfm
index 888199e..5754b6d 100644
--- a/Projects/Simba/framescript.lfm
+++ b/Projects/Simba/framescript.lfm
@@ -5,7 +5,6 @@ object ScriptFrame: TScriptFrame
   Width = 397
   ClientHeight = 328
   ClientWidth = 397
-  LCLVersion = '0.9.29'
   TabOrder = 0
   DesignLeft = 159
   DesignTop = 420
diff --git a/Projects/Simba/framescript.pas b/Projects/Simba/framescript.pas
index 357c75e..3bba372 100644
--- a/Projects/Simba/framescript.pas
+++ b/Projects/Simba/framescript.pas
@@ -85,7 +85,6 @@ type
     procedure MakeActiveScriptFrame;
     procedure ScriptThreadTerminate(Sender: TObject);
     constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
     { public declarations }
   end;
 
@@ -640,11 +639,6 @@ begin
 //  TSynPasSyn(SynEdit.Highlighter).NestedComments:= false; Does not work :(
 end;
 
-destructor TScriptFrame.Destroy;
-begin
-  inherited Destroy;
-end;
-
 initialization
   {$R *.lfm}
 
diff --git a/Projects/Simba/simbaunit.lfm b/Projects/Simba/simbaunit.lfm
index eda28b7..c2010fc 100644
--- a/Projects/Simba/simbaunit.lfm
+++ b/Projects/Simba/simbaunit.lfm
@@ -1,7 +1,7 @@
 object SimbaForm: TSimbaForm
-  Left = 150
+  Left = 143
   Height = 623
-  Top = 69
+  Top = 115
   Width = 660
   AllowDropFiles = True
   Caption = 'THA FUKING Simba'
@@ -1348,6 +1348,10 @@ object SimbaForm: TSimbaForm
         Caption = 'Settings'
         OnClick = MenuItemSettingsButtonClick
       end
+      object MenuItemBitmapConv: TMenuItem
+        Caption = 'New Item50'
+        OnClick = MenuItemBitmapConvClick
+      end
       object MenuItemDivider10: TMenuItem
         Caption = '-'
       end
diff --git a/Projects/Simba/simbaunit.pas b/Projects/Simba/simbaunit.pas
index 5e5c0f3..895869d 100644
--- a/Projects/Simba/simbaunit.pas
+++ b/Projects/Simba/simbaunit.pas
@@ -104,6 +104,7 @@ type
     MenuFile: TMenuItem;
     MenuEdit: TMenuItem;
     MenuHelp: TMenuItem;
+    MenuItemBitmapConv: TMenuItem;
     MenuItemExtensions: TMenuItem;
     MenuItemSettingsButton: TMenuItem;
     MenuItemDivider10: TMenuItem;
@@ -258,6 +259,7 @@ type
     procedure FunctionListEnter(Sender: TObject);
     procedure FunctionListExit(Sender: TObject);
     procedure FunctionListTimerTimer(Sender: TObject);
+    procedure MenuItemBitmapConvClick(Sender: TObject);
     procedure MenuItemExtensionsClick(Sender: TObject);
     procedure MenuItemHandbookClick(Sender: TObject);
     procedure MenuItemColourHistoryClick(Sender: TObject);
@@ -459,6 +461,7 @@ uses
    debugimage,
    files,
    InterfaceBase,
+   bitmapconv,
    extensionmanagergui,
    colourhistory,
    math;
@@ -1888,9 +1891,18 @@ begin
     frmFunctionList.LoadScriptTree(CurrScript.SynEdit.Text);
 end;
 
+procedure TSimbaForm.MenuItemBitmapConvClick(Sender: TObject);
+begin
+  BitmapConvForm.Show;
+end;
+
 procedure TSimbaForm.MenuItemExtensionsClick(Sender: TObject);
 begin
-  ExtensionsForm.Show;
+  MenuItemExtensions.Checked := not ExtensionsForm.Visible;
+  if MenuItemExtensions.Checked then
+    ExtensionsForm.Show
+  else
+    ExtensionsForm.Hide;
 end;
 
 procedure TSimbaForm.MenuItemHandbookClick(Sender: TObject);
@@ -2972,7 +2984,7 @@ end;
 
 destructor TMufasaTab.Destroy;
 begin
-  ScriptFrame.Free;
+//  ScriptFrame.Free;
   TabSheet.Free;
   inherited Destroy;
 end;