AbstractLauncherApplication.st
changeset 2040 06dd0e21aae0
parent 2038 2f58a17935b9
child 2041 52cd1ca19280
--- a/AbstractLauncherApplication.st	Fri Feb 26 00:05:05 1999 +0100
+++ b/AbstractLauncherApplication.st	Fri Feb 26 00:06:36 1999 +0100
@@ -24,7 +24,7 @@
     OpenLaunchers size > 0 ifTrue:[
         currentScreen := Screen current.
         OpenLaunchers do:[:aLauncher |
-            aLauncher window graphicsDevice == currentScreen ifTrue:[
+            aLauncher graphicsDevice == currentScreen ifTrue:[
                 ^ aLauncher
             ]
         ]
@@ -428,7 +428,7 @@
 
 !
 
-closeRequest
+requestForWindowClose
     "close request from windowing system (window close);
      confirm and ask if closing of launcher only or
      a smalltalk-exit is wanted"
@@ -436,16 +436,16 @@
     |answer|
 
     answer := Dialog 
-		confirmWithCancel:(resources string:'Close %1 only or exit Smalltalk (close all)?' with:self class name)
-		labels:(resources array:#('Cancel' 'Exit' 'Close'))
-		default:3.
+                confirmWithCancel:(resources string:'Close %1 only or exit Smalltalk (close all)?' with:self class name)
+                labels:(resources array:#('Cancel' 'Exit' 'Close'))
+                default:3.
     answer isNil ifTrue:[
-	"/ cancel
-	^self
+        "/ cancel
+        ^ false
     ].
 
     answer == true ifTrue:[
-	super closeRequest
+        ^ true
     ].
 
     self exit
@@ -646,15 +646,18 @@
 
     host := Dialog request:'Remote Launcher on which display:'.
     host size > 0 ifTrue:[
+        (host includes:$:) ifFalse:[
+            host := (host , ':0')
+        ].
         remoteDisplay := XWorkstation new.
-        remoteDisplay := remoteDisplay initializeFor:(host , ':0').
+        remoteDisplay := remoteDisplay initializeFor:host.
         remoteDisplay isNil ifTrue:[
-            self warn:'Could not connet to display.'.
+            self warn:'Could not connect to display: ''' , host , '''.'.
             ^ self
         ].
         remoteDisplay startDispatch.
         remoteDisplay keyboardMap:(Screen current keyboardMap).
-        self openOnDevice:remoteDisplay.
+        self class openOnDevice:remoteDisplay.
     ].
 
     "Created: / 10.9.1998 / 11:48:42 / cg"
@@ -4265,5 +4268,5 @@
 !AbstractLauncherApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.10 1999-02-25 22:06:08 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.11 1999-02-25 23:06:36 cg Exp $'
 ! !