From 40e8db56c2f712ee4ec91a5436d13875fd9f24f4 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 10 Oct 2008 15:11:46 +0000 Subject: [PATCH] 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 --- ba/ba0100.cpp | 2 +- ba/ba0102.cpp | 2 +- ba/ba0103.cpp | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ba/ba0100.cpp b/ba/ba0100.cpp index 02403ff44..432ba3fc8 100755 --- a/ba/ba0100.cpp +++ b/ba/ba0100.cpp @@ -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, diff --git a/ba/ba0102.cpp b/ba/ba0102.cpp index 7af4bd3b4..554839c1e 100755 --- a/ba/ba0102.cpp +++ b/ba/ba0102.cpp @@ -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; diff --git a/ba/ba0103.cpp b/ba/ba0103.cpp index 5cdd4aea0..ab1c6eac3 100755 --- a/ba/ba0103.cpp +++ b/ba/ba0103.cpp @@ -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!)