Fix property sheet error from not finding labelMorph font

When getting the property sheet of a labelMorph that is using a font
that doesn't exist in the 'x11Globals scalableFont' list an error
occurs and the property sheet can't display.

The scalableFont list has an undefinedSelector method which handles
direct requests for fonts that don't exist and returns 'times'.
Unfortunately the enumeration of the fonts that the property sheet
uses just lists the selectors of 'fontFamily' so treats the
undefinedSelect method as a font name and hence the default handlin
never occurs.

This fix taken here adds a 'defaultFont' to the scalableFont list.
This returns 'times', the same as the undefined selector. The
property sheet looks this up if the actual font name can't be found.

I also remove the undefined selector slot name and a couple of other
non-font slots that were missed in the x11Globals fontFamily method.

Author: doublec

objects/ui2/propertySheets.self

@@ -1,7 +1,7 @@
  '$Revision: 30.11 $'
  '
-Copyright 1992-2012 AUTHORS.
-See the LICENSE file for license information.
+Copyright 1992-2011 AUTHORS.
+See the legal/LICENSE file for license information and legal/AUTHORS for authors.
 '
 
 
@@ -116,7 +116,7 @@ SlotsToOmit: parent prototype.
             | 
             defaultButtonHolder: ui2Menu initializeDefaultButtonHolder: defaultButtonHolder.
             f: enumeratedTypeLabelMorph copyItemNames: labels Values: values DefaultButtonHolder: defaultButtonHolder.
-            f setSelectedIndex: (values asVector keyAt: v).
+            f setSelectedIndex: (values asVector keyAt: v IfAbsent: [ values asVector keyAt: 'defaultFont']).
             f fontSpec: globals fontSpec copyName: 'verdana' Size: outlinerPreferences mediumFontSize Style: 'bold'.
             buildFieldLabel: n ContentMorph: f).
         } | ) 
@@ -690,7 +690,7 @@ SlotsToOmit: parent prototype.
  bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'borderPropsMorph' -> () From: ( | {
          'Category: property specifics\x7fModuleInfo: Module: propertySheets InitialContents: InitializeToExpression: (nil)\x7fVisibility: private'
 
-         defaultButtonHolder.
+         defaultButtonHolder <- bootstrap stub -> 'globals' -> 'nil' -> ().
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'borderPropsMorph' -> () From: ( | {
@@ -886,7 +886,7 @@ SlotsToOmit: parent prototype.
  bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'labelPropsMorph' -> () From: ( | {
          'Category: property specifics\x7fModuleInfo: Module: propertySheets InitialContents: InitializeToExpression: (nil)\x7fVisibility: private'
 
-         defaultButtonHolder.
+         defaultButtonHolder <- bootstrap stub -> 'globals' -> 'nil' -> ().
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'labelPropsMorph' -> () From: ( | {
@@ -1119,7 +1119,7 @@ SlotsToOmit: parent prototype.
  bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'resizingPropsMorph' -> () From: ( | {
          'Category: property specifics\x7fModuleInfo: Module: propertySheets InitialContents: InitializeToExpression: (nil)\x7fVisibility: private'
 
-         defaultButtonHolder.
+         defaultButtonHolder <- bootstrap stub -> 'globals' -> 'nil' -> ().
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'resizingPropsMorph' -> () From: ( | {

objects/ui2/scalableFont.self

@@ -1,7 +1,7 @@
  'Sun-$Revision: 30.10 $'
  '
-Copyright 1992-2012 AUTHORS.
-See the LICENSE file for license information.
+Copyright 1992-2011 AUTHORS.
+See the legal/LICENSE file for license information and legal/AUTHORS for authors.
 '
 
 
@@ -236,6 +236,13 @@ SlotsToOmit: comment directory fileInTimeString myComment postFileIn revision su
          courierItalic = '-*-courier-medium-o-normal--'.
         } | ) 
 
+ bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'x11Globals' -> 'fontFamily' -> () From: ( | {
+         'Category: font substituion\x7fComment: Return font to be used for fonts that can\'t be found.\x7fModuleInfo: Module: scalableFont InitialContents: FollowSlot\x7fVisibility: public'
+        
+         defaultFont = ( |
+            | times).
+        } | ) 
+
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'x11Globals' -> 'fontFamily' -> () From: ( | {
          'ModuleInfo: Module: scalableFont InitialContents: FollowSlot'
 
@@ -560,7 +567,7 @@ I print out as asterisks.\x7fModuleInfo: Module: scalableFont InitialContents: F
               lastKvetchTime: now.
               ('unknown font: ', sel) printLine.
             ].
-            times).
+            defaultFont).
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'x11Globals' -> 'fontFamily' -> () From: ( | {
@@ -661,6 +668,9 @@ I print out as asterisks.\x7fModuleInfo: Module: scalableFont InitialContents: F
             (reflect: x11Globals fontFamily) do: [| :slot. :name | names add: name ].
             names remove: 'parent'.
             names remove: 'aNoteAboutMacXFonts'.
+            names remove: 'undefinedSelector:Type:Delegatee:MethodHolder:Arguments:'.
+            names remove: 'lastKvetchTime'.
+            names remove: 'lastKvetchTime:'.
             names asVector sort).
         } | )