From cec81817d72d520be5634a4d880f56fe0ee6db1d Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 6 May 2005 16:58:12 +0000 Subject: [PATCH] Patch level : 2.2 Files correlati : ve2 Ricompilazione Demo : [ ] Commento : Corretta generazione campi descrizione git-svn-id: svn://10.65.10.50/trunk@13062 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ca/calib01.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ca/calib01.cpp b/ca/calib01.cpp index f9a5a4e59..f9eaa02b6 100755 --- a/ca/calib01.cpp +++ b/ca/calib01.cpp @@ -417,7 +417,7 @@ int ca_create_fields(TMask& msk, int page, int logicnum, int x, int y, const int tab0 = x; const int tab1 = tab0 + maxdeslen + maxkeylen + 4; - if (mode == 0 || (mode & 0x1) != 0) + if (key_id > 0 && (mode == 0 || (mode & 0x1) != 0)) { for (int i = 0; i < mci.levels(); i++) { @@ -447,12 +447,12 @@ int ca_create_fields(TMask& msk, int page, int logicnum, int x, int y, } } - if (mode == 0 || (mode & 0x2) != 0) + if (des_id > 0 && (mode == 0 || (mode & 0x2) != 0)) { for (int i = 0; i < mci.levels(); i++) { const short did = des_id+i; - TEdit_field& dfld = msk.add_string(did, 0, "", tab1, y+i, 50, "B", 72+tab0-tab1); + TEdit_field& dfld = msk.add_string(did, page, "", tab1, y+i, 50, "B", 72+tab0-tab1); ca_create_browse2(dfld, i, logicnum, key_id, des_id); if ((mode & 0x2) != 0 && fieldname == NULL) dfld.set_key(2); @@ -737,6 +737,7 @@ int TSimple_anal_msk::create_key_fields() const int y = 1; const int n = ca_create_fields(*this, 0, logic, x, y, kid, did, 0x1); const int m = ca_create_fields(*this, 0, logic, x, y, kid, did, 0x2); + first_focus(kid); return n; }