--- a/TextView.st	Fri Aug 05 06:42:12 2016 +0200
+++ b/TextView.st	Wed Aug 10 18:18:42 2016 +0100
@@ -9,33 +9,31 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-'From Smalltalk/X, Version:7.1.0.0 on 15-07-2016 at 17:19:36'                   !
-
 "{ Package: 'stx:libwidg' }"
 
 "{ NameSpace: Smalltalk }"
 
 ListView subclass:#TextView
-        instanceVariableNames:'selectionStartLine selectionStartCol selectionEndLine
-                selectionEndCol clickPos clickStartLine clickStartCol clickLine
-                clickCol clickCount expandingTop wordStartCol wordStartLine
-                wordEndCol wordEndLine selectionFgColor selectionBgColor
-                selectStyle directoryForFileDialog defaultFileNameForFileDialog
-                externalEncoding contentsWasSaved searchAction lastSearchPattern
-                lastSearchWasMatch lastSearchIgnoredCase lastSearchDirection
-                lastSearchWasVariableSearch parenthesisSpecification dropSource
-                dragIsActive saveAction st80SelectMode searchBarActionBlock'
-        classVariableNames:'DefaultViewBackground DefaultSelectionForegroundColor
-                DefaultSelectionBackgroundColor
-                DefaultAlternativeSelectionForegroundColor
-                DefaultAlternativeSelectionBackgroundColor MatchDelayTime
-                WordSelectCatchesBlanks LastSearchPatterns
-                NumRememberedSearchPatterns LastSearchIgnoredCase
-                LastSearchWasMatch DefaultParenthesisSpecification
-                LastSearchWasMatchWithRegex LastSearchWasWrapAtEndOfText
-                LastSearchWasReplace LastSearchReplacedString'
-        poolDictionaries:''
-        category:'Views-Text'
+	instanceVariableNames:'selectionStartLine selectionStartCol selectionEndLine
+		selectionEndCol clickPos clickStartLine clickStartCol clickLine
+		clickCol clickCount expandingTop wordStartCol wordStartLine
+		wordEndCol wordEndLine selectionFgColor selectionBgColor
+		selectStyle directoryForFileDialog defaultFileNameForFileDialog
+		externalEncoding contentsWasSaved searchAction lastSearchPattern
+		lastSearchWasMatch lastSearchIgnoredCase lastSearchDirection
+		lastSearchWasVariableSearch parenthesisSpecification dropSource
+		dragIsActive saveAction st80SelectMode searchBarActionBlock'
+	classVariableNames:'DefaultViewBackground DefaultSelectionForegroundColor
+		DefaultSelectionBackgroundColor
+		DefaultAlternativeSelectionForegroundColor
+		DefaultAlternativeSelectionBackgroundColor MatchDelayTime
+		WordSelectCatchesBlanks LastSearchPatterns
+		NumRememberedSearchPatterns LastSearchIgnoredCase
+		LastSearchWasMatch DefaultParenthesisSpecification
+		LastSearchWasMatchWithRegex LastSearchWasWrapAtEndOfText
+		LastSearchWasReplace LastSearchReplacedString'
+	poolDictionaries:''
+	category:'Views-Text'
 !
 
 !TextView class methodsFor:'documentation'!
@@ -2836,7 +2834,7 @@
 
     |italicFont boldFont font|
 
-    font := gc createFontOnDevice.
+    font := gc deviceFont.
     "/ do we really need this info now?
     "/ on unix, it seems to work with the next two lines commented;
     "/ should probably check on windows too