From e0db7635e3998d5f543d58242347997300c1e158 Mon Sep 17 00:00:00 2001
From: h677 <h677>
Date: Thu, 14 Feb 2008 16:20:41 +0000
Subject: [PATCH] =?utf8?q?=E3=83=9E=E3=82=A6=E3=82=B9=E3=82=B8=E3=82=A7?=
 =?utf8?q?=E3=82=B9=E3=83=81=E3=83=A3=E3=83=BC=E3=81=AE=E8=A6=8B=E7=9B=B4?=
 =?utf8?q?=E3=81=97=20=E3=82=B5=E3=83=B3=E3=83=90=E3=82=BF=E3=82=A4?=
 =?utf8?q?=E3=83=9E=E3=83=BC=E3=81=AE=E8=A7=A3=E6=94=BE=E4=BD=8D=E7=BD=AE?=
 =?utf8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Editor.pas | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/Editor.pas b/Editor.pas
index afd5a03..cb31f65 100644
--- a/Editor.pas
+++ b/Editor.pas
@@ -205,7 +205,6 @@ type
 		FDebugStrReceive: string;
 		FDebugStrSend: string;
 		FNow: TDateTime;
-		FGestures	: TMouseGesture;
 		FInputAssistKey: String;	///< “ü—̓AƒVƒXƒg‚̃L[
 		FResistWords: TStringList;	///< “ü—̓AƒVƒXƒg‚ÌŽ«‘‚©‚ç‚ÌŒŸõŒ‹‰Ê
         FSambaTimer: TSambaTimer;   ///< Samba‘΍ô‚̃^ƒCƒ}[
@@ -390,19 +389,6 @@ begin
 
 	// ƒL[Ý’è‚̓ǂݍž‚Ý
 	GikoSys.LoadKeySetting(ActionList, GikoSys.GetEditorKeyFileName);
-	// ƒ}ƒEƒXƒWƒFƒXƒ`ƒƒ[‚̃Cƒ“ƒXƒg[ƒ‹
-	if GikoSys.Setting.GestureEnabled then begin
-		MouseGesture.UnHook;
-		FGestures := TMouseGesture.Create;
-		GikoSys.Setting.Gestures.ClearGesture;
-
-		GikoSys.Setting.Gestures.LoadGesture(
-			GikoSys.Setting.GetGestureFileName, ActionList );
-		MouseGesture.OnGestureStart := OnGestureStart;
-		MouseGesture.OnGestureMove := OnGestureMove;
-		MouseGesture.OnGestureEnd := OnGestureEnd;
-		MouseGesture.SetHook( Handle );
-	end;
 	SaveNameMailAction.Checked := True;
 end;
 procedure TEditorForm.SetBoard(Item: TBoard);
@@ -635,13 +621,21 @@ end;
 procedure TEditorForm.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
 	Action := caFree;
-    FSambaTimer.Free;
+    if GikoSys.Setting.GestureEnabled then begin
+        GikoSys.Setting.Gestures.ClearGesture;
+        MouseGesture.UnHook;
+		MouseGesture.OnGestureStart := nil;
+		MouseGesture.OnGestureMove := nil;
+		MouseGesture.OnGestureEnd := nil;
+    end;
 end;
 
 procedure TEditorForm.FormDestroy(Sender: TObject);
 var
 	wp: TWindowPlacement;
 begin
+    FSambaTimer.Free;
+    
 	//Å‘剻EƒEƒBƒ“ƒhƒEˆÊ’u•Û‘¶
 	wp.length := sizeof(wp);
 	GetWindowPlacement(Handle, @wp);
@@ -654,8 +648,6 @@ begin
 	//GikoSys.Setting.EditWindowStay := FormStyle = fsStayOnTop;      // ƒXƒeƒCó‘Ô‚Ì•Û‘¶
 	GikoSys.Setting.EditWindowTranslucent := TransAction.Checked;   // ”¼“§–¾ó‘Ô‚Ì•Û‘¶
 
-	FGestures.Free;
-
 end;
 
 procedure TEditorForm.SetNameList(sName, sMail: string);
-- 
2.11.0