--- a/XWorkstation.st	Thu Feb 20 13:03:38 1997 +0100
+++ b/XWorkstation.st	Thu Feb 20 13:05:14 1997 +0100
@@ -3283,6 +3283,17 @@
 
 !XWorkstation methodsFor:'event forwarding'!
 
+circulateNotifyView:aView
+    "sent, when the stacking order changes.
+     ignored for now."
+
+!
+
+circulateRequestView:aView
+    "sent, when the stacking order is about to change.
+     ignored for now."
+!
+
 colorMapChangeView:aView
     "sent, when another colormap is installed.
      This is a very X-specific mechanism."
@@ -3534,6 +3545,8 @@
     static struct inlineCache repar = _ILC1;
     static struct inlineCache confReq = _ILC1;
     static struct inlineCache resReq = _ILC1;
+    static struct inlineCache circReq = _ILC1;
+    static struct inlineCache circNotify = _ILC1;
     static struct inlineCache gravNotify = _ILC1;
     static struct inlineCache prop = _ILC1;
     static struct inlineCache selClear = _ILC2;
@@ -3695,6 +3708,7 @@
 	    else
 		nextMultiClickTime = 0;
 
+
 	    if ((t = __INST(multiClickTime)) != nil) {
 		int _multiClickTime;
 
@@ -3947,7 +3961,11 @@
 	    break;
 
 	case CirculateNotify:
+	    (*circNotify.ilc_func)(self, @symbol(circulateNotifyView:), nil, &circNotify, theView);
+	    break;
+
 	case CirculateRequest:
+	    (*circReq.ilc_func)(self, @symbol(circulateRequestView:), nil, &circReq, theView);
 	    break;
 
 	case PropertyNotify:
@@ -5468,7 +5486,7 @@
 	    if (i1 >= 0) {
 		i2 = __intVal(index2) - 1;
 		if (i2 < i1) {
-		    RETURN (self);
+		    RETURN ( __MKSMALLINT(0) );
 		}
 
 		cp = (char *) _stringVal(aString);
@@ -5553,7 +5571,7 @@
 fail: ;
 %}.
     self primitiveFailed.
-    ^ nil
+    ^ 0
 !
 
 widthOf:aString inFont:aFontId
@@ -5649,7 +5667,7 @@
   fail: ;
 %}.
     self primitiveFailed.
-    ^ nil
+    ^ 0
 ! !
 
 !XWorkstation methodsFor:'grabbing '!
@@ -8632,6 +8650,6 @@
 !XWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.205 1997-02-13 13:25:34 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.206 1997-02-20 12:05:14 cg Exp $'
 ! !
 XWorkstation initialize!