ギコナビ更新で、利用したインストーラのexeを削除する処理を追加。

[gikonavigoeson/gikonavi.git] / Gesture.pas

diff --git a/Gesture.pas b/Gesture.pas
index 5d649ff..75e7a52 100644 (file)
--- a/Gesture.pas
+++ b/Gesture.pas
@@ -9,7 +9,7 @@ uses
 type
        TMouseGesture = class(TObject)
        private
-               FHook: Integer;
+               FHook: Cardinal;
                FHandle: THandle;
                FGestureItemList: TStringList;
                FBeginGesture: Boolean;
@@ -25,7 +25,6 @@ type
                function CheckAction(Message: Integer; x, y: Integer): Boolean;
                procedure AddAction(sx, sy: Integer);
                function AddGesture(Item: string): Integer;
-               procedure ClearGesture;
                function Get(Index: integer): string;
                procedure Put(Index: integer; Item: string);
        public
@@ -37,6 +36,7 @@ type
                property GestureCount: Integer read GetGestureCount;
                property Margin: Integer read FMargin write FMargin;
                function GetGestureStr: string;
+               procedure Clear;
                property OnGestureStart: TNotifyEvent read FOnGestureStart write FOnGestureStart;
                property OnGestureMove: TNotifyEvent read FOnGestureMove write FOnGestureMove;
                property OnGestureEnd: TNotifyEvent read FOnGestureEnd write FOnGestureEnd;
@@ -65,7 +65,7 @@ end;
 destructor TMouseGesture.Destroy;
 begin
        UnHook;
-       ClearGesture;
+       Clear;
        FGestureItemList.Free;
        inherited;
 end;
@@ -161,9 +161,11 @@ begin
                                FBeginGesture := False;
                                ReleaseCapture;
                                if FGestureItemList.Count <> 0 then begin
-                                       if Assigned(FOnGestureEnd) then
+                                       if Assigned(FOnGestureEnd) then begin
                                                FOnGestureEnd(Self);
-                                       ClearGesture;
+                    end else begin
+                        Clear;
+                    end;
                                end else begin
                                        FCancelMode := True;
                                        //\83W\83F\83X\83`\83\83\81[\82¶\82á\82È\82©\82Á\82½\8fê\8d\87\81A\83}\83E\83XDOWN,UP\82ð\83G\83~\83\85\83\8c\81[\83g
@@ -239,7 +241,7 @@ begin
 end;
 
 //\83W\83F\83X\83`\83\83\81[\82ð\83N\83\8a\83A\82·\82é
-procedure TMouseGesture.ClearGesture;
+procedure TMouseGesture.Clear;
 begin
        FGestureItemList.Clear;
 end;