# HG changeset patch
# User Claus Gittinger <cg@exept.de>
# Date 950280968 -3600
# Node ID f1bae6d68ffe14a66cdc569635aa49c5d29fe172
# Parent  0ff1df7d83101d210f823608fbe19cf933dba0b5
eliminated styleSheet name = win95 queries

diff -r 0ff1df7d8310 -r f1bae6d68ffe CheckBox.st
--- a/CheckBox.st	Fri Feb 11 14:18:08 2000 +0100
+++ b/CheckBox.st	Fri Feb 11 15:56:08 2000 +0100
@@ -663,7 +663,7 @@
      (either explicit, via tabbing; or implicit, by pointer movement)
       - change any display attributes as req'd."
 
-    styleSheet name == #win95 ifTrue:[
+    (styleSheet at:#'focusHighlightStyle') == #win95 ifTrue:[
         labelView hasFocus:true.
         labelView invalidate.
     ] ifFalse:[
@@ -679,7 +679,7 @@
      (either explicit, via tabbing; or implicit, by pointer movement)
       - change any display attributes as req'd."
 
-    styleSheet name == #win95 ifTrue:[
+    (styleSheet at:#'focusHighlightStyle') ifTrue:[
         labelView hasFocus:false.
         labelView invalidate.
     ] ifFalse:[
@@ -841,5 +841,5 @@
 !CheckBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/CheckBox.st,v 1.64 2000-02-03 17:34:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/CheckBox.st,v 1.65 2000-02-11 14:56:08 cg Exp $'
 ! !
diff -r 0ff1df7d8310 -r f1bae6d68ffe ComboView.st
--- a/ComboView.st	Fri Feb 11 14:18:08 2000 +0100
+++ b/ComboView.st	Fri Feb 11 15:56:08 2000 +0100
@@ -372,7 +372,7 @@
 !
 
 initialize
-    |prefExt leftInset rightInset prefWidth halfSpacing l|
+    |prefExt leftInset rightInset prefWidth halfSpacing l nm|
 
     super initialize.
 
@@ -404,12 +404,14 @@
         rightInset := prefWidth.
     ].
 
-    (styleSheet name = #win95
-    or:[styleSheet name = #st80]) ifTrue:[
+    nm := styleSheet name.
+    (nm = #win95
+    or:[nm = #win98
+    or:[nm = #st80]]) ifTrue:[
         field level:0.
         self level:-1.
         pullDownButton rightInset:0.
-        styleSheet name = #win95 ifTrue:[
+        nm ~= #st80 ifTrue:[
             leftInset := (ArrowButton new preferredExtent x).
             rightInset := leftInset.
         ].
@@ -617,5 +619,5 @@
 !ComboView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/ComboView.st,v 1.58 1999-12-09 11:16:01 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ComboView.st,v 1.59 2000-02-11 14:56:00 cg Exp $'
 ! !
diff -r 0ff1df7d8310 -r f1bae6d68ffe ExtendedComboBox.st
--- a/ExtendedComboBox.st	Fri Feb 11 14:18:08 2000 +0100
+++ b/ExtendedComboBox.st	Fri Feb 11 15:56:08 2000 +0100
@@ -901,7 +901,7 @@
 readOnly:aState
     "set the menuField to readonly or writable
     "
-    |newField|
+    |newField nm|
 
     isReadOnly == aState ifTrue:[ ^ self ].
     isReadOnly := aState.
@@ -931,7 +931,8 @@
                 newField leftInset:(ViewSpacing // 2).
             ]
         ].
-        (styleSheet name = #win95 or:[styleSheet name = #st80]) ifTrue:[
+        nm := styleSheet name.
+        (nm = #win95 or:[nm = #win98 or:[nm = #st80]]) ifTrue:[
             newField level:0.
             newField leftInset:0.
         ].
@@ -1085,7 +1086,7 @@
 initialize
     "setup defaults
     "
-    |prefExt leftInset halfSpacing l|
+    |prefExt leftInset halfSpacing l nm|
 
     super initialize.
 
@@ -1114,11 +1115,14 @@
         leftInset := prefExt x + menuButton borderWidth.
     ].
 
-    (styleSheet name = #win95 or:[styleSheet name = #st80]) ifTrue:[
+    nm := styleSheet name.
+    (nm = #win95 
+    or:[nm = #win98 
+    or:[nm = #st80]]) ifTrue:[
         self level:-1.
         menuButton rightInset:0.
 
-        styleSheet name = #win95 ifTrue:[
+        nm ~= #st80 ifTrue:[
             leftInset := (ArrowButton new preferredExtent x).
         ].
     ].
@@ -1514,5 +1518,5 @@
 !ExtendedComboBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/ExtendedComboBox.st,v 1.17 2000-01-11 11:08:24 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ExtendedComboBox.st,v 1.18 2000-02-11 14:55:52 cg Exp $'
 ! !
diff -r 0ff1df7d8310 -r f1bae6d68ffe NoteBookView.st
--- a/NoteBookView.st	Fri Feb 11 14:18:08 2000 +0100
+++ b/NoteBookView.st	Fri Feb 11 15:56:08 2000 +0100
@@ -746,7 +746,8 @@
             ].
             selTab redrawAt:direction selected:true on:self.
 
-            (self hasFocus and:[styleSheet name == #win95]) ifTrue:[
+            (self hasFocus 
+            and:[(styleSheet at:#'focusHighlightStyle') == #win95]) ifTrue:[
                 selTab drawWin95FocusFrameOn:self
             ].
             selTab layout:savLyt.
@@ -851,7 +852,7 @@
     "
     |tab|
 
-    styleSheet name == #win95 ifTrue:[
+    (styleSheet at:#'focusHighlightStyle') == #win95 ifTrue:[
         (tab := self selectedTab) notNil ifTrue:[
             self invalidateTab:tab
         ]
@@ -866,7 +867,7 @@
     "
     |tab|
 
-    styleSheet name == #win95 ifTrue:[
+    (styleSheet at:#'focusHighlightStyle') == #win95 ifTrue:[
         (tab := self selectedTab) notNil ifTrue:[
             self invalidateTab:tab
         ]
@@ -1976,5 +1977,5 @@
 !NoteBookView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/NoteBookView.st,v 1.36 2000-02-08 20:27:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/NoteBookView.st,v 1.37 2000-02-11 14:55:33 cg Exp $'
 ! !