TerminalApplication.st
branchjv
changeset 12123 4bde08cebd48
parent 10937 9e0d1a54404a
child 12125 0c49a3b13e43
--- a/TerminalApplication.st	Fri Jan 27 22:18:53 2012 +0100
+++ b/TerminalApplication.st	Sun Jan 29 12:53:39 2012 +0000
@@ -351,29 +351,25 @@
 createWorkspace
     |scr|
 
-"/    JV@2011-11-30: XTermView disabled as recent changes in
-"/    #startShellInSelectedWindow leads to infinite loop.
-"/    further investigation needed.        
+    (OperatingSystem isUNIXlike and:[XTermView notNil]) ifTrue:[
+        scr := XTermView new
+    ] ifFalse:[
+    VT100TerminalView isNil ifTrue:[
+        self error:'missing: VT100TerminalView'
+    ].
 
-"/    (OperatingSystem isUNIXlike and:[XTermView notNil]) ifTrue:[
-"/        scr := XTermView new.
-"/        scr workingDirectory: initialDirectory.
-"/    ] ifFalse:[
-        VT100TerminalView isNil ifTrue:[
-            self error:'missing: VT100TerminalView'
-        ].
         scr := (HVScrollableView for:VT100TerminalView).
         scr autoHideScrollBars:false.
         scr horizontalMini:true.
-"/    ].
+    ].
 
     self window realized ifTrue:[
         self window sensor pushUserEvent:#startShellInSelectedWindow for:self.
     ].
     ^ scr
 
+    "Modified: / 25-11-2010 / 12:45:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 08-04-2011 / 14:56:57 / cg"
-    "Modified (format): / 30-11-2011 / 11:06:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 doKill
@@ -476,5 +472,5 @@
 !TerminalApplication class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/TerminalApplication.st,v 1.11 2011-11-30 10:06:32 vrany Exp $'
-! !
+    ^ '§Header: /cvs/stx/stx/libtool/TerminalApplication.st,v 1.10 2011/07/07 14:13:17 vrany Exp §'
+! !
\ No newline at end of file