Patch level : 10.0

Files correlati     : ba0
Ricompilazione Demo : [ ]
Commento            :
Eliminato uso della vecchia MAKE_COLOR ed aggiornato con XVT_MAKE_COLOR


git-svn-id: svn://10.65.10.50/trunk@17415 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2008-10-10 15:11:46 +00:00
parent 535d60ad4b
commit 40e8db56c2
3 changed files with 6 additions and 3 deletions

View File

@ -767,7 +767,7 @@ const char* TColor_mask::cid2name(short cid) const
COLOR TColor_mask::cid2color(short cid) const
{
COLOR color[] = { MAKE_COLOR(201,194,188), COLOR_WHITE, COLOR_GRAY,
COLOR color[] = { XVT_MAKE_COLOR(201,194,188), COLOR_WHITE, COLOR_GRAY,
COLOR_BLACK, COLOR_WHITE, blend_colors(COLOR_WHITE, COLOR_YELLOW, 0.60),
COLOR_BLACK, COLOR_YELLOW,
COLOR_DKGRAY, COLOR_LTGRAY,

View File

@ -1038,7 +1038,7 @@ bool TSpidey_mask::stop_run(KEY k)
const unsigned int r = XVT_COLOR_GET_RED(rgb) / 2;
const unsigned int g = XVT_COLOR_GET_GREEN(rgb) / 2;
const unsigned int b = XVT_COLOR_GET_BLUE(rgb) / 2;
xvt_image_set_pixel(img, x, y, MAKE_COLOR(r, g, b));
xvt_image_set_pixel(img, x, y, XVT_MAKE_COLOR(r, g, b));
}
}
image[i] = img;

View File

@ -187,7 +187,10 @@ short TBook_window::add_page(const TString& caption)
WIN_DEF wd; memset(&wd, 0, sizeof(wd));
wd.wtype = WC_NOTEBK;
wd.v.ctl.ctrl_id = DLG_MAIN;
wd.v.ctl.flags = CTL_FLAG_CENTER_JUST; // i.e. bottom!
wd.v.ctl.flags = CTL_FLAG_TAB_BOTTOM; // should be wxCHECK_VERSION(2,8,9)
wd.v.ctl.flags |= CTL_FLAG_CENTER_JUST; // old compatibility flags
xvt_vobj_get_client_rect(win(), &wd.rct);
_ctrl = xvt_ctl_create_def(&wd, win(), 0L);
// Blocca le dimensioni del pannello (Non va micca!)