- wt_gfx_color(basecol);
- wt_gfx_fillrect(r);
- wt_gfx_color(style == FRM_OUT ? basecol + 2 : basecol + 1);
- wt_gfx_line(r->x, r->y + r->height, r->x + r->width - 1, r->y + r->height);
- wt_gfx_line(r->x + r->width, r->y + 1, r->x + r->width, r->y + r->height);
- wt_gfx_color(style == FRM_OUT ? basecol + 1 : basecol + 2);
- wt_gfx_line(r->x, r->y, r->x + r->width, r->y);
- wt_gfx_line(r->x, r->y + 1, r->x, r->y + r->height - 1);
+ if((style & FRM_NOFILL) == 0) {
+ wt_gfx_color(basecol);
+ wt_gfx_fillrect(r);
+ }
+ wt_gfx_color(FRMSTYLE(style) == FRM_OUT ? basecol + 2 : basecol + 1);
+ wt_gfx_fillrect4i(r->x + 1, r->y + r->height - 1, r->width - 2, 1);
+ wt_gfx_fillrect4i(r->x + r->width - 1, r->y, 1, r->height);
+ wt_gfx_color(FRMSTYLE(style) == FRM_OUT ? basecol + 1 : basecol + 2);
+ wt_gfx_fillrect4i(r->x + 1, r->y, r->width - 2, 1);
+ wt_gfx_fillrect4i(r->x, r->y, 1, r->height);