From 6f9e755910079f891a954394876f4b96af77fd73 Mon Sep 17 00:00:00 2001 From: f_swallow Date: Thu, 6 Jan 2011 00:43:03 +0000 Subject: [PATCH] =?utf8?q?KeyDown=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92?= =?utf8?q?=E5=B0=91=E3=81=97=E6=9B=B8=E3=81=8D=E6=8F=9B=E3=81=88=E3=80=82I?= =?utf8?q?nteger=E3=82=92ModifierState=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@1324 e39ad16e-3079-482e-bb30-4b4d378143b6 --- Tween/Tween.vb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Tween/Tween.vb b/Tween/Tween.vb index b6495254..0909474a 100644 --- a/Tween/Tween.vb +++ b/Tween/Tween.vb @@ -4800,7 +4800,7 @@ RETRY: pnl.Controls("comboLang").Focused OrElse _ pnl.Controls("buttonSearch").Focused Then Exit Sub End If - Dim State As Integer = GetModifierState(e.Control, e.Shift, e.Alt) + Dim State As ModifierState = GetModifierState(e.Control, e.Shift, e.Alt) If State = ModifierState.NotFlags Then Exit Sub If State <> ModifierState.Non Then _anchorFlag = False If CommonKeyDown(e.KeyCode, ModifierState.ListTab, State) Then @@ -4811,7 +4811,7 @@ RETRY: End Sub - Public Function GetModifierState(ByVal sControl As Boolean, ByVal sShift As Boolean, ByVal sAlt As Boolean) As Integer + Public Function GetModifierState(ByVal sControl As Boolean, ByVal sShift As Boolean, ByVal sAlt As Boolean) As ModifierState If Not sAlt AndAlso Not sControl AndAlso Not sShift Then Return ModifierState.Non If sControl Then If sShift AndAlso Not sAlt Then @@ -4848,7 +4848,7 @@ RETRY: StatusText = 103 End Enum - Public Function CommonKeyDown(ByVal KeyCode As System.Windows.Forms.Keys, ByVal Focused As Integer, ByVal Modifier As Integer) As Boolean + Public Function CommonKeyDown(ByVal KeyCode As System.Windows.Forms.Keys, ByVal Focused As ModifierState, ByVal Modifier As ModifierState) As Boolean Dim Pressed As Boolean = False '修飾キーなし @@ -5874,7 +5874,7 @@ RETRY: End Sub Private Sub StatusText_KeyDown(ByVal sender As System.Object, ByVal e As System.Windows.Forms.KeyEventArgs) Handles StatusText.KeyDown - Dim State As Integer = GetModifierState(e.Control, e.Shift, e.Alt) + Dim State As ModifierState = GetModifierState(e.Control, e.Shift, e.Alt) If State = ModifierState.NotFlags Then Exit Sub If CommonKeyDown(e.KeyCode, ModifierState.StatusText, State) Then e.Handled = True @@ -6128,7 +6128,7 @@ RETRY: End Sub Private Sub PostBrowser_PreviewKeyDown(ByVal sender As System.Object, ByVal e As System.Windows.Forms.PreviewKeyDownEventArgs) Handles PostBrowser.PreviewKeyDown - Dim State As Integer = GetModifierState(e.Control, e.Shift, e.Alt) + Dim State As ModifierState = GetModifierState(e.Control, e.Shift, e.Alt) If State = ModifierState.NotFlags Then Exit Sub Dim KeyRes As Boolean = CommonKeyDown(e.KeyCode, ModifierState.PostBrowser, State) If KeyRes Then -- 2.11.0