--- a/WinWorkstat.st Wed May 19 21:24:38 1999 +0200
+++ b/WinWorkstat.st Wed May 19 22:14:41 1999 +0200
@@ -457,7 +457,6 @@
static int lastClickX, lastClickY;
static int deltaDoubleClickX = -999;
static int deltaDoubleClickY = -999;
-static UINT multiClickTime;
static UINT nextMultiClickTime;
static int destroyWin;
static int __modifiers;
@@ -8280,7 +8279,7 @@
if (isDoubleClick) {
multiClickState = 1;
- nextMultiClickTime = ev->ev_time + multiClickTime;
+ nextMultiClickTime = ev->ev_time + __intVal(__INST(multiClickTimeDelta));
ipS = &bmp;
symS = @symbol(buttonMultiPress:x:y:view:);
} else {
@@ -8292,7 +8291,7 @@
&& (y >= (lastClickY - (deltaDoubleClickY / 2)))
&& (y <= (lastClickY + (deltaDoubleClickY / 2)))
) {
- nextMultiClickTime = ev->ev_time + multiClickTime;
+ nextMultiClickTime = ev->ev_time + __intVal(__INST(multiClickTimeDelta));
ipS = &bmp;
symS = @symbol(buttonMultiPress:x:y:view:);
} else {
@@ -10204,7 +10203,7 @@
focusMode := #activeWindow.
buttonTranslation := ButtonTranslation.
-"/ multiClickTimeDelta := MultiClickTimeDelta. "/ ignored - defined by preference-panel
+"/ multiClickTimeDelta := MultiClickTimeDelta. "/ ignored - initialized from WIN settings
self initializeModifierMappings
!
@@ -10456,9 +10455,10 @@
%{
int nvi, i, val, capabilities, planes, numcolors, numpens;
RECT rect;
+ UINT multiClickTime;
multiClickTime = GetDoubleClickTime();
- DPRINTF(("multiClickTime = %d\n",multiClickTime));
+ DPRINTF(("multiClickTime = %d\n", multiClickTime));
__INST(multiClickTimeDelta) = __MKSMALLINT(multiClickTime);
GetWindowRect(__rootWin, &rect);
@@ -12258,6 +12258,6 @@
!WinWorkstation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Attic/WinWorkstat.st,v 1.130 1999-05-19 19:24:38 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Attic/WinWorkstat.st,v 1.131 1999-05-19 20:14:41 cg Exp $'
! !
WinWorkstation initialize!
--- a/WinWorkstation.st Wed May 19 21:24:38 1999 +0200
+++ b/WinWorkstation.st Wed May 19 22:14:41 1999 +0200
@@ -457,7 +457,6 @@
static int lastClickX, lastClickY;
static int deltaDoubleClickX = -999;
static int deltaDoubleClickY = -999;
-static UINT multiClickTime;
static UINT nextMultiClickTime;
static int destroyWin;
static int __modifiers;
@@ -8280,7 +8279,7 @@
if (isDoubleClick) {
multiClickState = 1;
- nextMultiClickTime = ev->ev_time + multiClickTime;
+ nextMultiClickTime = ev->ev_time + __intVal(__INST(multiClickTimeDelta));
ipS = &bmp;
symS = @symbol(buttonMultiPress:x:y:view:);
} else {
@@ -8292,7 +8291,7 @@
&& (y >= (lastClickY - (deltaDoubleClickY / 2)))
&& (y <= (lastClickY + (deltaDoubleClickY / 2)))
) {
- nextMultiClickTime = ev->ev_time + multiClickTime;
+ nextMultiClickTime = ev->ev_time + __intVal(__INST(multiClickTimeDelta));
ipS = &bmp;
symS = @symbol(buttonMultiPress:x:y:view:);
} else {
@@ -10204,7 +10203,7 @@
focusMode := #activeWindow.
buttonTranslation := ButtonTranslation.
-"/ multiClickTimeDelta := MultiClickTimeDelta. "/ ignored - defined by preference-panel
+"/ multiClickTimeDelta := MultiClickTimeDelta. "/ ignored - initialized from WIN settings
self initializeModifierMappings
!
@@ -10456,9 +10455,10 @@
%{
int nvi, i, val, capabilities, planes, numcolors, numpens;
RECT rect;
+ UINT multiClickTime;
multiClickTime = GetDoubleClickTime();
- DPRINTF(("multiClickTime = %d\n",multiClickTime));
+ DPRINTF(("multiClickTime = %d\n", multiClickTime));
__INST(multiClickTimeDelta) = __MKSMALLINT(multiClickTime);
GetWindowRect(__rootWin, &rect);
@@ -12258,6 +12258,6 @@
!WinWorkstation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.130 1999-05-19 19:24:38 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.131 1999-05-19 20:14:41 cg Exp $'
! !
WinWorkstation initialize!