diff options
| -rw-r--r-- | src/screen.c | 2 | ||||
| -rw-r--r-- | src/screen.h | 2 | ||||
| -rw-r--r-- | src/settings.c | 14 | ||||
| -rw-r--r-- | src/wireframe.c | 6 |
4 files changed, 3 insertions, 21 deletions
diff --git a/src/screen.c b/src/screen.c index 74342f20b..e0252d572 100644 --- a/src/screen.c +++ b/src/screen.c @@ -306,8 +306,6 @@ myScreenInit (DisplayInfo *display_info, GdkScreen *gscr, unsigned long event_ma screen_info->font_height = 0; screen_info->box_gc = None; - screen_info->black_gc = NULL; - screen_info->white_gc = NULL; screen_info->title_colors[ACTIVE].gc = NULL; screen_info->title_colors[ACTIVE].allocated = FALSE; screen_info->title_colors[INACTIVE].gc = NULL; diff --git a/src/screen.h b/src/screen.h index e29f4e9fe..e35cc0fc6 100644 --- a/src/screen.h +++ b/src/screen.h @@ -96,8 +96,6 @@ struct _ScreenInfo /* Per screen graphic contexts */ GC box_gc; - GdkGC *black_gc; - GdkGC *white_gc; /* Title font height */ gint font_height; diff --git a/src/settings.c b/src/settings.c index a0dbb4ad4..3d7065b19 100644 --- a/src/settings.c +++ b/src/settings.c @@ -509,20 +509,6 @@ loadTheme (ScreenInfo *screen_info, Settings *rc) setXfwmColor (screen_info, &screen_info->title_shadow_colors[ACTIVE], rc, 2, "dark", "selected"); setXfwmColor (screen_info, &screen_info->title_shadow_colors[INACTIVE], rc, 3, "dark", "insensitive"); - if (screen_info->black_gc) - { - g_object_unref (G_OBJECT (screen_info->black_gc)); - } - screen_info->black_gc = widget->style->black_gc; - g_object_ref (G_OBJECT (widget->style->black_gc)); - - if (screen_info->white_gc) - { - g_object_unref (G_OBJECT (screen_info->white_gc)); - } - screen_info->white_gc = widget->style->white_gc; - g_object_ref (G_OBJECT (widget->style->white_gc)); - for (i = 0; i < SIDE_COUNT; i++) { if (i == SIDE_TOP) diff --git a/src/wireframe.c b/src/wireframe.c index 44790e159..9ac4e17e1 100644 --- a/src/wireframe.c +++ b/src/wireframe.c @@ -94,11 +94,11 @@ wireframeDrawXlib (WireFrame *wireframe, int width, int height) wireframe->mapped = TRUE; XDrawRectangle (myScreenGetXDisplay (screen_info), wireframe->xwindow, - gdk_x11_gc_get_xgc (screen_info->white_gc), + screen_info->box_gc, 0, 0, wireframe->width - 1, wireframe->height - 1); XDrawRectangle (myScreenGetXDisplay (screen_info), wireframe->xwindow, - gdk_x11_gc_get_xgc (screen_info->white_gc), + screen_info->box_gc, OUTLINE_WIDTH - 1, OUTLINE_WIDTH - 1, wireframe->width - 2 * (OUTLINE_WIDTH - 1) - 1, wireframe->height- 2 * (OUTLINE_WIDTH - 1) - 1); @@ -112,7 +112,7 @@ wireframeDrawXlib (WireFrame *wireframe, int width, int height) wireframe->mapped = TRUE; XDrawRectangle (myScreenGetXDisplay (screen_info), wireframe->xwindow, - gdk_x11_gc_get_xgc (screen_info->white_gc), + screen_info->box_gc, 0, 0, wireframe->width - 1, wireframe->height - 1); } } |