Correzione listbox in msksheet

git-svn-id: svn://10.65.10.50/trunk@3083 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
villa 1996-06-25 08:33:01 +00:00
parent 5b459898d4
commit 1c95e7a580

View File

@ -709,7 +709,8 @@ const char* TSpreadsheet::copy_cell2field(XI_OBJ* cell)
txt = xi_get_text(cell, NULL, -1); txt = xi_get_text(cell, NULL, -1);
if (_edit_field->is_editable()) if (_edit_field->is_editable())
{ {
const TString& val = ((TEditable_field*)_edit_field)->win2raw(txt); const char* val = _edit_field->is_kind_of(CLASS_LIST_FIELD) ? txt :
(const char*)((TEditable_field*)_edit_field)->win2raw(txt);
_edit_field->set(val); _edit_field->set(val);
_edit_field->set_dirty(); // Get it dirty! _edit_field->set_dirty(); // Get it dirty!
} }
@ -786,7 +787,7 @@ bool TSpreadsheet::event_handler(XI_OBJ* itf, XI_EVENT *xiev)
src = row(rec).get(col); // Set value for cell src = row(rec).get(col); // Set value for cell
if (src && *src) if (src && *src)
{ {
if (maxlen == 3 && e->is_kind_of(CLASS_LIST_FIELD)) if (/*maxlen == 3 && */ e->is_kind_of(CLASS_LIST_FIELD))
/* src = src */; // Leave code as is /* src = src */; // Leave code as is
else else
src = e->raw2win(src); // Get formatted string src = e->raw2win(src); // Get formatted string