window to change after hiding a layer using the toolbar and then
refreshing the layout. Fixed by saving and restoring the graphics
state around the routine that configures the toolbar image. Also
added a check to CifPaintCurrent to guard against using an unassigned
ClientData record as a pointer (causes a crash), and added braces
around "expr" values in the Tcl wrapper, which reportedly results in
faster execution of the expression.