#1096 glColor not being restored after some User Preferences changes

[Scott]

It looks like when we change the Domain Frame Color and the Subregion Frame Color, the glColor settings get applied to the axis annotations. To reproduce:

1) Open any dataset
2) Enable axis annotations
3) Change domain frame color or subregion frame color under User Preferences

This however does not affect the time stamp annotation text color.

[Scott]

Changing the navigation mode to any of the 3d renderers [Region, Flow Rake, Barb Rake] also paints axis labels red

[Alan Norton]

The region frame, domain frame, and manip colors were all leaking.

[clynejp]

This fix appears to have introduced a regression that results in gl errors under Mac OSX 10.8 (don't know about other platforms)

To reproduce:
1. Load any data set (e.g. Duku.vdf)
2. Under viz preferences check Enable axis annotation
3. Click apply. The message "glError: invalid enumerant" at glwindow.cpp line 1394

[Alan Norton]

Raised to 7 because of the glErrors that are now occurring

[Alan Norton]

There was a typo in the axis-rendering code.