Merge jv
authorMerge Script
Tue, 16 Aug 2016 06:52:33 +0200
branchjv
changeset 3733 230841cba598
parent 3731 5d985849d597 (current diff)
parent 3732 90373997e1a1 (diff)
child 3737 6660f8d04bea
Merge
--- a/ExternalTopView.st	Fri Aug 12 06:45:44 2016 +0200
+++ b/ExternalTopView.st	Tue Aug 16 06:52:33 2016 +0200
@@ -195,7 +195,7 @@
     "add myself to the windowGroup of anSTXWindow ...
      and reparent anSTXWindow to be the (only) child of myself"
 
-    |wg oldTopView retryCount deviceErrorOccured|
+    |wg oldTopView retryCount deviceErrorOccurred|
 
     anSTXWindow borderWidth:0. anSTXWindow forceBorderWidth.
     self borderWidth:0.        "/ self forceBorderWidth.
@@ -238,12 +238,12 @@
         to:self id.
     anSTXWindow device unBuffered.
     retryCount := 0.
-    deviceErrorOccured := false.
+    deviceErrorOccurred := false.
     [
 
         GLXWorkstation deviceErrorSignal handle:[:ex|
           'DeviceErrorSignal raised in becomeParentOf: ' infoPrintCR.
-           deviceErrorOccured := true.
+           deviceErrorOccurred := true.
 "/          (Delay waitForSeconds: 1).
 "/          retryCount := retryCount + 1.
 "/          retryCount > 5 ifTrue:[
@@ -251,13 +251,13 @@
 "/          ].
           ex proceed
         ] do:[
-            deviceErrorOccured := false.
+            deviceErrorOccurred := false.
             anSTXWindow enableEvent:#structureNotify.
         ].
     ] ensure:[
         anSTXWindow device buffered.
     ].
-    deviceErrorOccured ifTrue:[^false].
+    deviceErrorOccurred ifTrue:[^false].
 
 
  self checkWindowStillAlive ifFalse:[ Transcript showCR:'x2'. ^ true].