--- a/TopView.st Tue Jan 05 15:39:22 2016 +0100
+++ b/TopView.st Fri Jan 15 13:11:20 2016 +0000
@@ -723,14 +723,14 @@
!TopView methodsFor:'help stubs'!
flyByHelpTextFor:aSubView
- "this will vanish - its temporarily here to allow for stdSysViews to be
+ "this will vanish - it's temporarily here to allow for stdSysViews to be
used as a masterApp for dialogs"
^ nil
!
helpTextFor:aSubView
- "this will vanish - its temporarily here to allow for stdSysViews to be
+ "this will vanish - it's temporarily here to allow for stdSysViews to be
used as a masterApp for dialogs"
^ nil
@@ -1480,11 +1480,11 @@
!TopView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/TopView.st,v 1.153 2015-02-24 15:47:12 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview/TopView.st,v 1.153 2015-02-24 15:47:12 cg Exp $'
+ ^ '$Header$'
! !
--- a/WindowGroup.st Tue Jan 05 15:39:22 2016 +0100
+++ b/WindowGroup.st Fri Jan 15 13:11:20 2016 +0000
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 1993 by Claus Gittinger
All Rights Reserved
@@ -2781,7 +2779,7 @@
|oldCursors dev deviceCursor retVal|
dev := self graphicsDevice.
- (dev isNil or:[aCursor isNil] or:[inWithCursorDoBlock == true]) ifTrue:[
+ (dev isNil or:[aCursor isNil or:[inWithCursorDoBlock == true]]) ifTrue:[
^ aBlock value
].
@@ -2867,11 +2865,11 @@
!WindowGroup class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.343 2015-05-11 15:27:27 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.343 2015-05-11 15:27:27 cg Exp $'
+ ^ '$Header$'
! !
--- a/WindowSensor.st Tue Jan 05 15:39:22 2016 +0100
+++ b/WindowSensor.st Fri Jan 15 13:11:20 2016 +0000
@@ -2483,16 +2483,31 @@
when the target windowGroups process is rescheduled)."
anEvent timeStamp isNil ifTrue:[
- anEvent timeStamp:(Timestamp now).
+ anEvent timeStamp:Timestamp now.
].
"/ inform all local and global eventListeners ?
- ("anyListenerReturnedTrue :=" self notifyEventListenersAbout:anEvent) ifTrue:[
+ (self notifyEventListenersAbout:anEvent) ifTrue:[
"/ event was eaten
^ self
].
self basicPushEvent:anEvent.
+ "
+ |b|
+ b := Button label:'test'.
+ b action:[Transcript showCR:'hallo'].
+ b open.
+ (Delay forSeconds:5) wait.
+ b sensor pushEvent:(WindowEvent pointerEnter:0 x:1 y:1 view:b).
+ (Delay forSeconds:1) wait.
+ b sensor pushEvent:(WindowEvent buttonPress:1 x:1 y:1 view:b).
+ (Delay forSeconds:2) wait.
+ b sensor pushEvent:(WindowEvent buttonRelease:1 x:1 y:1 view:b).
+ (Delay forSeconds:1) wait.
+ b sensor pushEvent:(WindowEvent pointerLeave:0 view:b).
+ "
+
"Created: / 18-09-1995 / 22:37:57 / claus"
"Modified: / 29-06-2011 / 18:57:19 / cg"
! !
@@ -2582,21 +2597,6 @@
"
|b|
b := Button label:'test'.
- b action:[Transcript showCR:'hallo'].
- b open.
- (Delay forSeconds:5) wait.
- b sensor pushEvent:(WindowEvent pointerEnter:0 x:1 y:1 view:b).
- (Delay forSeconds:1) wait.
- b sensor pushEvent:(WindowEvent buttonPress:1 x:1 y:1 view:b).
- (Delay forSeconds:2) wait.
- b sensor pushEvent:(WindowEvent buttonRelease:1 x:1 y:1 view:b).
- (Delay forSeconds:1) wait.
- b sensor pushEvent:(WindowEvent pointerLeave:0 view:b).
- "
-
- "
- |b|
- b := Button label:'test'.
b open.
(Delay forSeconds:5) wait.
b sensor pushUserEvent:#fooBar for:b withArguments:#().
--- a/XWorkstation.st Tue Jan 05 15:39:22 2016 +0100
+++ b/XWorkstation.st Fri Jan 15 13:11:20 2016 +0000
@@ -5641,12 +5641,10 @@
"/ where eventPending returns wrong if we do not flush the buffer.
"/ (especially Win32 & Xlib)
- ConservativeSync == true ifTrue:[self sync].
-
dispatchingExpose notNil ifTrue:[
- ^ self exposeEventPendingFor:dispatchingExpose withSync:false
- ].
- ^ self eventPendingWithSync:false
+ ^ self exposeEventPendingFor:dispatchingExpose withSync:ConservativeSync
+ ].
+ ^ self eventPendingWithSync:ConservativeSync
"Modified: / 28.4.1999 / 11:08:12 / cg"
!
@@ -5701,20 +5699,20 @@
OBJ rslt = false;
if (ISCONNECTED) {
- Display *dpy = myDpy;
-
- if (XEventsQueued(dpy, QueuedAlready)) {
- RETURN (true);
- }
-
- ENTER_XLIB();
- if (doSync == true) {
- XSync(dpy, 0); /* make certain everything is flushed */
- }
- if (XPending(dpy)) {
- rslt = true;
- }
- LEAVE_XLIB();
+ Display *dpy = myDpy;
+
+ if (XEventsQueued(dpy, QueuedAlready)) {
+ RETURN (true);
+ }
+
+ ENTER_XLIB();
+ if (doSync == true) {
+ XSync(dpy, 0); /* make certain everything is flushed */
+ }
+ if (XEventsQueued(dpy, QueuedAfterFlush)) {
+ rslt = true;
+ }
+ LEAVE_XLIB();
}
RETURN ( rslt );
%}
@@ -5738,17 +5736,12 @@
the display connection)."
%{ /* UNLIMITEDSTACK */
- OBJ rslt = false;
-
if (ISCONNECTED) {
- /* ENTER ... LEAVE not needed; XEventsQueued will not block */
- /* ENTER_XLIB(); */
- if (XEventsQueued(myDpy, QueuedAlready)) {
- rslt = true;
- }
- /* LEAVE_XLIB(); */
- }
- RETURN ( rslt );
+ if (XEventsQueued(myDpy, QueuedAlready)) {
+ RETURN(true);
+ }
+ }
+ RETURN ( false );
%}
!
--- a/resources/de.rs Tue Jan 05 15:39:22 2016 +0100
+++ b/resources/de.rs Fri Jan 15 13:11:20 2016 +0000
@@ -12,6 +12,7 @@
'No' 'Nein'
; ok 'ok'
Abort 'Abbrechen'
+'Abort All' 'Alles abbrechen'
Proceed 'Fortfahren'
Undo 'Rückgängig'
'Undo (%1)' 'Rückgängig (%1)'