diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:10 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:10 +0000 |
| commit | c133bf70e69202ea5ba5636a5279cd4512e5fc29 (patch) | |
| tree | 3574b16ca30f0a458ab629b49a71c3e0d0e794ec /Clock.c | |
| parent | e87aea23d80c4519a1e2ab97582cfdce6729dbdb (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'Clock.c')
| -rw-r--r-- | Clock.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/xclock/Clock.c,v 3.24 2002/10/21 13:33:07 alanh Exp $ */ +/* $XFree86: xc/programs/xclock/Clock.c,v 3.26 2003/10/25 00:52:37 dawes Exp $ */ #include <X11/Xlib.h> #include <X11/StringDefs.h> @@ -133,15 +133,15 @@ static XtResource resources[] = { {XtNforeground, XtCForeground, XtRXftColor, sizeof(XftColor), offset(fg_color), XtRString, XtDefaultForeground}, {XtNhourColor, XtCForeground, XtRXftColor, sizeof(XftColor), - offset(hour_color), XtRString, "rgba:7f/00/00/c0"}, + offset(hour_color), XtRString, XtDefaultForeground}, {XtNminuteColor, XtCForeground, XtRXftColor, sizeof(XftColor), - offset(min_color), XtRString, "rgba:00/7f/7f/c0"}, + offset(min_color), XtRString, XtDefaultForeground}, {XtNsecondColor, XtCForeground, XtRXftColor, sizeof(XftColor), - offset(sec_color), XtRString, "rgba:00/00/ff/80"}, + offset(sec_color), XtRString, XtDefaultForeground}, {XtNmajorColor, XtCForeground, XtRXftColor, sizeof(XftColor), - offset(major_color), XtRString, "rgba:7f/00/00/c0"}, + offset(major_color), XtRString, XtDefaultForeground}, {XtNminorColor, XtCForeground, XtRXftColor, sizeof(XftColor), - offset(minor_color), XtRString, "rgba:00/7f/7f/c0"}, + offset(minor_color), XtRString, XtDefaultForeground}, {XtNface, XtCFace, XtRXftFont, sizeof (XftFont *), offset (face), XtRString, ""}, #endif @@ -563,7 +563,7 @@ Initialize (Widget request, Widget new, ArgList args, Cardinal *num_args) #endif } -#if XRENDER +#ifdef XRENDER static void RenderPrepare (ClockWidget w, XftColor *color) { |