From 4bf0faf049cc0090f9245792c48ed598b67f5069 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 29 Sep 2014 17:15:46 +0000 Subject: drop background, as it is included in core widget --- Sgraph.c | 6 ++---- SgraphP.h | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Sgraph.c b/Sgraph.c index bbe717a..6161660 100644 --- a/Sgraph.c +++ b/Sgraph.c @@ -41,8 +41,6 @@ static void mirror(Widget, XEvent *, String *, Cardinal *); static XtResource resources[] = { { XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel), Offset(foreground), XtRString, XtDefaultForeground }, - { XtNbackground, XtCBackground, XtRPixel, sizeof(Pixel), - Offset(background), XtRString, XtDefaultBackground }, { XtNmirror, XtCBoolean, XtRBoolean, sizeof(Boolean), Offset(mirror), XtRBoolean, False }, { XtNdata, XtCData, XtRPointer, sizeof(int *), @@ -113,9 +111,9 @@ GetGC(Widget w) Trace(w); xgcv.plane_mask = AllPlanes; - xgcv.background = sw->sgraph.background; + xgcv.background = sw->core.background_pixel; - xgcv.foreground = sw->sgraph.background; + xgcv.foreground = sw->core.background_pixel; sw->sgraph.backGC = XtGetGC(w, gc_mask, &xgcv); xgcv.foreground = sw->sgraph.foreground; diff --git a/SgraphP.h b/SgraphP.h index ba138bc..2060b48 100644 --- a/SgraphP.h +++ b/SgraphP.h @@ -21,7 +21,6 @@ #include "Sgraph.h" typedef struct { - Pixel background; Pixel foreground; Boolean mirror; int *data; -- cgit v1.2.3