diff --git a/src/include/maskfld.cpp b/src/include/maskfld.cpp index e91a2c512..06382da28 100755 --- a/src/include/maskfld.cpp +++ b/src/include/maskfld.cpp @@ -3969,7 +3969,9 @@ void TList_field::set(const char* data) void TList_field::set_window_data(const char* data) { - NFCHECK(0,"So' passato da 'sta stronza!!!"); + NFCHECK(0, "So' passato da 'sta stronza!!!"); + if (dlg() == 105) + int i = 0; const int i = str2curr(win2raw(data)); current(i); } diff --git a/src/include/sheet.cpp b/src/include/sheet.cpp index b18e8fae6..46f736478 100755 --- a/src/include/sheet.cpp +++ b/src/include/sheet.cpp @@ -1711,11 +1711,15 @@ bool TCursor_sheet::filter_dialog() TString16 prompt = fname; prompt.left_just(12); TString4 flags; TString ffname = get_tmp_string() << (j ? AFILTRO : DAFILTRO) << fname; + const short id = 101 + i + j * 20; + const int y = i + 1; + const int x = 1 + (j * max_len); + switch (ft) { case _alfafld: case _charfld: - m.add_string(101 + i + j * 20, 0, prompt, 1 + (j * max_len), i + 1, rec.length(fname), flags).set_field(ffname); + m.add_string(id, 0, prompt, x, y, rec.length(fname), flags).set_field(ffname); break; case _intzerofld: case _longzerofld: @@ -1723,11 +1727,14 @@ bool TCursor_sheet::filter_dialog() case _wordfld: case _intfld: case _longfld: - m.add_number(101 + i + j * 20, 0, prompt, 1 + (j * max_len), i + 1, rec.length(fname), flags).set_field(ffname); + m.add_number(id, 0, prompt, x, y, rec.length(fname), flags).set_field(ffname); break; case _datefld: - m.add_date(101 + i + j * 20, 0, prompt, 1 + (j * max_len), i + 1, flags).set_field(ffname); + m.add_date(id, 0, prompt, x, y, flags).set_field(ffname); break; + case _boolfld: + m.add_boolean(id, 0, prompt, x, y, flags).set_field(ffname); + break; default: break; }