--- a/styles/Adwaita.style	Sat Feb 21 02:05:23 2015 +0100
+++ b/styles/Adwaita.style	Sat Feb 21 02:16:40 2015 +0100
@@ -1,6 +1,6 @@
 ; View defaultStyle:#Adwaita
 ;
-; $Header: /cvs/stx/stx/libview/styles/Adwaita.style,v 1.5 2015-02-21 01:03:42 cg Exp $
+; $Header: /cvs/stx/stx/libview/styles/Adwaita.style,v 1.6 2015-02-21 01:16:40 cg Exp $
 
 name                            #Adwaita
 scroller.vista3DStyle           false
@@ -69,17 +69,17 @@
 menu.enteredForegroundColor                 =menu.hilightForegroundColor
 menu.iconIndicationOn.bitmapFile            'CheckOn_xp.xpm'
 menu.iconIndicationOff.bitmapFile           'CheckOff_xp.xpm'
-menu.iconRadioOn.bitmap                     (VistaToolbarIconLibrary radioOn12x12Icon)
-menu.iconRadioOff.bitmap                    (VistaToolbarIconLibrary radioOff12x12Icon)
+menu.iconRadioOn.bitmap                     (ToolbarIconLibrary radioOn12x12Icon)
+menu.iconRadioOff.bitmap                    (ToolbarIconLibrary radioOff12x12Icon)
 menu.iconDisabledIndicationOn.bitmapFile    'CheckOn_disabled_xp.xpm'
 menu.iconDisabledIndicationOff.bitmapFile   'CheckOff_disabled_xp.xpm'
-menu.iconDisabledRadioOn.bitmap             (VistaToolbarIconLibrary radioOnDisabled12x12Icon)
-menu.iconDisabledRadioOff.bitmap            (VistaToolbarIconLibrary radioOffDisabled12x12Icon)
+menu.iconDisabledRadioOn.bitmap             (ToolbarIconLibrary radioOnDisabled12x12Icon)
+menu.iconDisabledRadioOff.bitmap            (ToolbarIconLibrary radioOffDisabled12x12Icon)
 
-menu.iconIndicationOn             [VistaToolbarIconLibrary checkToggleOnIcon]
-menu.iconIndicationOff            [VistaToolbarIconLibrary checkToggleOffIcon]
-menu.iconDisabledIndicationOn     [VistaToolbarIconLibrary checkToggleOffDisabledIcon]
-menu.iconDisabledIndicationOff    [VistaToolbarIconLibrary checkToggleOffIcon]
+menu.iconIndicationOn             [ToolbarIconLibrary checkToggleOnIcon]
+menu.iconIndicationOff            [ToolbarIconLibrary checkToggleOffIcon]
+menu.iconDisabledIndicationOn     [ToolbarIconLibrary checkToggleOffDisabledIcon]
+menu.iconDisabledIndicationOff    [ToolbarIconLibrary checkToggleOffIcon]
 
 pullDownMenu.level                0
 
@@ -89,10 +89,10 @@
 ;button.passiveLevel                    3
 ;button.enteredBackgroundColor          [ (Screen current getSystemColor:#'COLOR_BTNFACE') lightened ]
 
-comboView.downForm                      [VistaToolbarIconLibrary scrollDownOffIcon]
-comboView.disabledDownForm              [VistaToolbarIconLibrary scrollDownOffIcon]
-comboView.enteredDownForm               [VistaToolbarIconLibrary scrollDownOffEntered2Icon]
-comboView.activeDownForm                [VistaToolbarIconLibrary scrollDownActiveIcon]
+comboView.downForm                      [ToolbarIconLibrary scrollDownOffIcon]
+comboView.disabledDownForm              [ToolbarIconLibrary scrollDownOffIcon]
+comboView.enteredDownForm               [ToolbarIconLibrary scrollDownOffEntered2Icon]
+comboView.activeDownForm                [ToolbarIconLibrary scrollDownActiveIcon]
 ; comboView.downFormFile                  'ComboDn_xp.xpm'.
 ; comboView.disabledDownFormFile          'ComboDn_disabled_xp.xpm'.
 ; comboView.activeDownFormFile            'ComboDn_active_xp.xpm'.
@@ -131,25 +131,25 @@
 miniScroller.size               3     "/ in millimeters
 
 
-arrowButton.upForm                  [VistaToolbarIconLibrary scrollUpOffIcon]
-arrowButton.enteredUpForm           [VistaToolbarIconLibrary scrollUpOffEntered2Icon]
-arrowButton.activeUpForm            [VistaToolbarIconLibrary scrollUpActiveIcon]
-arrowButton.disabledUpForm          [VistaToolbarIconLibrary scrollUpOffIcon]
+arrowButton.upForm                  [ToolbarIconLibrary scrollUpOffIcon]
+arrowButton.enteredUpForm           [ToolbarIconLibrary scrollUpOffEntered2Icon]
+arrowButton.activeUpForm            [ToolbarIconLibrary scrollUpActiveIcon]
+arrowButton.disabledUpForm          [ToolbarIconLibrary scrollUpOffIcon]
 
-arrowButton.downForm                [VistaToolbarIconLibrary scrollDownOffIcon]
-arrowButton.enteredDownForm         [VistaToolbarIconLibrary scrollDownOffEntered2Icon]
-arrowButton.activeDownForm          [VistaToolbarIconLibrary scrollDownActiveIcon]
-arrowButton.disabledDownForm        [VistaToolbarIconLibrary scrollDownOffIcon]
+arrowButton.downForm                [ToolbarIconLibrary scrollDownOffIcon]
+arrowButton.enteredDownForm         [ToolbarIconLibrary scrollDownOffEntered2Icon]
+arrowButton.activeDownForm          [ToolbarIconLibrary scrollDownActiveIcon]
+arrowButton.disabledDownForm        [ToolbarIconLibrary scrollDownOffIcon]
 
-arrowButton.leftForm                [VistaToolbarIconLibrary scrollLeftOffIcon]
-arrowButton.enteredLeftForm         [VistaToolbarIconLibrary scrollLeftOffEntered2Icon]
-arrowButton.activeLeftForm          [VistaToolbarIconLibrary scrollLeftActiveIcon]
-arrowButton.disabledLeftForm        [VistaToolbarIconLibrary scrollLeftOffIcon]
+arrowButton.leftForm                [ToolbarIconLibrary scrollLeftOffIcon]
+arrowButton.enteredLeftForm         [ToolbarIconLibrary scrollLeftOffEntered2Icon]
+arrowButton.activeLeftForm          [ToolbarIconLibrary scrollLeftActiveIcon]
+arrowButton.disabledLeftForm        [ToolbarIconLibrary scrollLeftOffIcon]
 
-arrowButton.rightForm               [VistaToolbarIconLibrary scrollRightOffIcon]
-arrowButton.enteredRightForm        [VistaToolbarIconLibrary scrollRightOffEntered2Icon]
-arrowButton.activeRightForm         [VistaToolbarIconLibrary scrollRightActiveIcon]
-arrowButton.disabledRightForm       [VistaToolbarIconLibrary scrollRightOffIcon]
+arrowButton.rightForm               [ToolbarIconLibrary scrollRightOffIcon]
+arrowButton.enteredRightForm        [ToolbarIconLibrary scrollRightOffEntered2Icon]
+arrowButton.activeRightForm         [ToolbarIconLibrary scrollRightActiveIcon]
+arrowButton.disabledRightForm       [ToolbarIconLibrary scrollRightOffIcon]
 
 
 arrowButton.leftFormFile          'ScrollLt.xp.xpm'
@@ -179,18 +179,18 @@
 
 
 checkToggle.bitmapFile            'CheckOn10_xp.xpm'
-radioButton.passiveImage          [VistaToolbarIconLibrary radioOff12x12Icon]
-radioButton.activeImage           [VistaToolbarIconLibrary radioOn12x12Icon]
-radioButton.enteredPassiveImage   [VistaToolbarIconLibrary radioOffEntered12x12Icon]
-radioButton.enteredActiveImage    [VistaToolbarIconLibrary radioOnEntered12x12Icon]
-radioButton.disabledPassiveImage  [VistaToolbarIconLibrary radioOffDisabled12x12Icon]
-radioButton.disabledActiveImage   [VistaToolbarIconLibrary radioOnDisabled12x12Icon]
-checkToggle.disabledActiveImage   [VistaToolbarIconLibrary checkToggleOnDisabledIcon]
-checkToggle.disabledPassiveImage  [VistaToolbarIconLibrary checkToggleOffDisabledIcon]
-checkToggle.activeImage           [VistaToolbarIconLibrary checkToggleOnIcon]
-checkToggle.passiveImage          [VistaToolbarIconLibrary checkToggleOffIcon]
-checkToggle.enteredPassiveImage   [VistaToolbarIconLibrary checkToggleOffEnteredIcon]
-checkToggle.enteredActiveImage    [VistaToolbarIconLibrary checkToggleOnEnteredIcon]
+radioButton.passiveImage          [ToolbarIconLibrary radioOff12x12Icon]
+radioButton.activeImage           [ToolbarIconLibrary radioOn12x12Icon]
+radioButton.enteredPassiveImage   [ToolbarIconLibrary radioOffEntered12x12Icon]
+radioButton.enteredActiveImage    [ToolbarIconLibrary radioOnEntered12x12Icon]
+radioButton.disabledPassiveImage  [ToolbarIconLibrary radioOffDisabled12x12Icon]
+radioButton.disabledActiveImage   [ToolbarIconLibrary radioOnDisabled12x12Icon]
+checkToggle.disabledActiveImage   [ToolbarIconLibrary checkToggleOnDisabledIcon]
+checkToggle.disabledPassiveImage  [ToolbarIconLibrary checkToggleOffDisabledIcon]
+checkToggle.activeImage           [ToolbarIconLibrary checkToggleOnIcon]
+checkToggle.passiveImage          [ToolbarIconLibrary checkToggleOffIcon]
+checkToggle.enteredPassiveImage   [ToolbarIconLibrary checkToggleOffEnteredIcon]
+checkToggle.enteredActiveImage    [ToolbarIconLibrary checkToggleOnEnteredIcon]
 checkToggle.activeLevel           0
 checkToggle.passiveLevel          0
 checkToggle.disabledBackgroundColor     =viewGrey