From 7adf1d1a25065c544ebb7db949a9b657bf107887 Mon Sep 17 00:00:00 2001 From: David Capello Date: Sun, 6 Jan 2013 14:48:32 -0300 Subject: [PATCH] Remove bevel_box() and SkinTheme::draw_bevel_box() --- src/modules/gfx.cpp | 15 --------------- src/modules/gfx.h | 1 - src/skin/skin_theme.cpp | 15 --------------- src/skin/skin_theme.h | 1 - 4 files changed, 32 deletions(-) diff --git a/src/modules/gfx.cpp b/src/modules/gfx.cpp index da73c258f..24a31d923 100644 --- a/src/modules/gfx.cpp +++ b/src/modules/gfx.cpp @@ -273,21 +273,6 @@ void rect_tracker_free(RectTracker* rt) /**********************************************************************/ /* Rectangles */ -void bevel_box(BITMAP* bmp, int x1, int y1, int x2, int y2, int c1, int c2, int bevel) -{ - hline(bmp, x1+bevel, y1, x2-bevel, c1); /* top */ - hline(bmp, x1+bevel, y2, x2-bevel, c2); /* bottom */ - - vline(bmp, x1, y1+bevel, y2-bevel, c1); /* left */ - vline(bmp, x2, y1+bevel, y2-bevel, c2); /* right */ - - line(bmp, x1, y1+bevel, x1+bevel, y1, c1); /* top-left */ - line(bmp, x1, y2-bevel, x1+bevel, y2, c2); /* bottom-left */ - - line(bmp, x2-bevel, y1, x2, y1+bevel, c2); /* top-right */ - line(bmp, x2-bevel, y2, x2, y2-bevel, c2); /* bottom-right */ -} - void rectgrid(BITMAP* bmp, int x1, int y1, int x2, int y2, int w, int h) { if (w < 1 || h < 1) diff --git a/src/modules/gfx.h b/src/modules/gfx.h index 7172bd992..ac29b5b06 100644 --- a/src/modules/gfx.h +++ b/src/modules/gfx.h @@ -34,7 +34,6 @@ void dotted_mode(int offset); RectTracker* rect_tracker_new(BITMAP* bmp, int x1, int y1, int x2, int y2); void rect_tracker_free(RectTracker* tracker); -void bevel_box(BITMAP* bmp, int x1, int y1, int x2, int y2, ui::Color c1, ui::Color c2, int bevel); void rectgrid(BITMAP* bmp, int x1, int y1, int x2, int y2, int w, int h); void draw_emptyset_symbol(BITMAP* bmp, const gfx::Rect& rc, ui::Color color); diff --git a/src/skin/skin_theme.cpp b/src/skin/skin_theme.cpp index f8bdd7997..0910fe103 100644 --- a/src/skin/skin_theme.cpp +++ b/src/skin/skin_theme.cpp @@ -2142,21 +2142,6 @@ void SkinTheme::draw_part_as_vline(BITMAP* bmp, int x1, int y1, int x2, int y2, } } -void SkinTheme::draw_bevel_box(int x1, int y1, int x2, int y2, int c1, int c2, int *bevel) -{ - hline(ji_screen, x1+bevel[0], y1, x2-bevel[1], c1); /* top */ - hline(ji_screen, x1+bevel[2], y2, x2-bevel[3], c2); /* bottom */ - - vline(ji_screen, x1, y1+bevel[0], y2-bevel[2], c1); /* left */ - vline(ji_screen, x2, y1+bevel[1], y2-bevel[3], c2); /* right */ - - line(ji_screen, x1, y1+bevel[0], x1+bevel[0], y1, c1); /* top-left */ - line(ji_screen, x1, y2-bevel[2], x1+bevel[2], y2, c2); /* bottom-left */ - - line(ji_screen, x2-bevel[1], y1, x2, y1+bevel[1], c2); /* top-right */ - line(ji_screen, x2-bevel[3], y2, x2, y2-bevel[3], c2); /* bottom-right */ -} - void SkinTheme::less_bevel(int *bevel) { if (bevel[0] > 0) --bevel[0]; diff --git a/src/skin/skin_theme.h b/src/skin/skin_theme.h index cf0ede32c..349738979 100644 --- a/src/skin/skin_theme.h +++ b/src/skin/skin_theme.h @@ -186,7 +186,6 @@ private: bool fill_bg, ui::Widget* widget, const gfx::Rect& rc, int selected_offset); void draw_entry_caret(ui::Entry* widget, int x, int y); - void draw_bevel_box(int x1, int y1, int x2, int y2, int c1, int c2, int *bevel); void less_bevel(int *bevel); void paintIcon(ui::Widget* widget, ui::Graphics* g, ui::IButtonIcon* iconInterface, int x, int y);