diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/fl_plastic.cxx | 4 | ||||
| -rw-r--r-- | src/fl_round_box.cxx | 36 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/fl_plastic.cxx b/src/fl_plastic.cxx index f4ee49103..6fdf02c1e 100644 --- a/src/fl_plastic.cxx +++ b/src/fl_plastic.cxx @@ -278,9 +278,9 @@ static void up_frame(int x, int y, int w, int h, Fl_Color c) { static void narrow_thin_box(int x, int y, int w, int h, Fl_Color c) { if (h<=0 || w<=0) return; const uchar *g = fl_gray_ramp(); - fl_color(shade_color(g['R'], c)); + fl_color(shade_color(g[(int)'R'], c)); fl_rectf(x+1, y+1, w-2, h-2); - fl_color(shade_color(g['I'], c)); + fl_color(shade_color(g[(int)'I'], c)); if (w > 1) { fl_xyline(x+1, y, x+w-2); fl_xyline(x+1, y+h-1, x+w-2); diff --git a/src/fl_round_box.cxx b/src/fl_round_box.cxx index ad4423ae6..e31a8c26f 100644 --- a/src/fl_round_box.cxx +++ b/src/fl_round_box.cxx @@ -76,29 +76,29 @@ extern const uchar* fl_gray_ramp(); void fl_round_down_box(int x, int y, int w, int h, Fl_Color bgcolor) { const uchar *g = fl_gray_ramp(); draw(FILL, x, y, w, h, 2, bgcolor); - draw(UPPER_LEFT, x+1, y, w-2, h, 0, (Fl_Color)g['N']); - draw(UPPER_LEFT, x+1, y, w-2, h, 1, (Fl_Color)g['H']); - draw(UPPER_LEFT, x, y, w, h, 0, (Fl_Color)g['N']); - draw(UPPER_LEFT, x, y, w, h, 1, (Fl_Color)g['H']); - draw(LOWER_RIGHT, x, y, w, h, 0, (Fl_Color)g['S']); - draw(LOWER_RIGHT, x+1, y, w-2, h, 0, (Fl_Color)g['U']); - draw(LOWER_RIGHT, x, y, w, h, 1, (Fl_Color)g['U']); - draw(LOWER_RIGHT, x+1, y, w-2, h, 1, (Fl_Color)g['W']); - draw(CLOSED, x, y, w, h, 2, (Fl_Color)g['A']); + draw(UPPER_LEFT, x+1, y, w-2, h, 0, (Fl_Color)g[(int)'N']); + draw(UPPER_LEFT, x+1, y, w-2, h, 1, (Fl_Color)g[(int)'H']); + draw(UPPER_LEFT, x, y, w, h, 0, (Fl_Color)g[(int)'N']); + draw(UPPER_LEFT, x, y, w, h, 1, (Fl_Color)g[(int)'H']); + draw(LOWER_RIGHT, x, y, w, h, 0, (Fl_Color)g[(int)'S']); + draw(LOWER_RIGHT, x+1, y, w-2, h, 0, (Fl_Color)g[(int)'U']); + draw(LOWER_RIGHT, x, y, w, h, 1, (Fl_Color)g[(int)'U']); + draw(LOWER_RIGHT, x+1, y, w-2, h, 1, (Fl_Color)g[(int)'W']); + draw(CLOSED, x, y, w, h, 2, (Fl_Color)g[(int)'A']); } void fl_round_up_box(int x, int y, int w, int h, Fl_Color bgcolor) { const uchar *g = fl_gray_ramp(); draw(FILL, x, y, w, h, 2, bgcolor); - draw(LOWER_RIGHT, x+1, y, w-2, h, 0, (Fl_Color)g['H']); - draw(LOWER_RIGHT, x+1, y, w-2, h, 1, (Fl_Color)g['N']); - draw(LOWER_RIGHT, x, y, w, h, 1, (Fl_Color)g['H']); - draw(LOWER_RIGHT, x, y, w, h, 2, (Fl_Color)g['N']); - draw(UPPER_LEFT, x, y, w, h, 2, (Fl_Color)g['U']); - draw(UPPER_LEFT, x+1, y, w-2, h, 1, (Fl_Color)g['S']); - draw(UPPER_LEFT, x, y, w, h, 1, (Fl_Color)g['W']); - draw(UPPER_LEFT, x+1, y, w-2, h, 0, (Fl_Color)g['U']); - draw(CLOSED, x, y, w, h, 0, (Fl_Color)g['A']); + draw(LOWER_RIGHT, x+1, y, w-2, h, 0, (Fl_Color)g[(int)'H']); + draw(LOWER_RIGHT, x+1, y, w-2, h, 1, (Fl_Color)g[(int)'N']); + draw(LOWER_RIGHT, x, y, w, h, 1, (Fl_Color)g[(int)'H']); + draw(LOWER_RIGHT, x, y, w, h, 2, (Fl_Color)g[(int)'N']); + draw(UPPER_LEFT, x, y, w, h, 2, (Fl_Color)g[(int)'U']); + draw(UPPER_LEFT, x+1, y, w-2, h, 1, (Fl_Color)g[(int)'S']); + draw(UPPER_LEFT, x, y, w, h, 1, (Fl_Color)g[(int)'W']); + draw(UPPER_LEFT, x+1, y, w-2, h, 0, (Fl_Color)g[(int)'U']); + draw(CLOSED, x, y, w, h, 0, (Fl_Color)g[(int)'A']); } extern void fl_internal_boxtype(Fl_Boxtype, Fl_Box_Draw_F*); |