diff --git a/uppsrc/CtrlLib/src.tpp/TextCtrl$en-us.tpp b/uppsrc/CtrlLib/src.tpp/TextCtrl$en-us.tpp index 0c974f5b2..3f6d2aace 100644 --- a/uppsrc/CtrlLib/src.tpp/TextCtrl$en-us.tpp +++ b/uppsrc/CtrlLib/src.tpp/TextCtrl$en-us.tpp @@ -430,6 +430,17 @@ ool]_[*@3 b]_`=_[@(0.0.255) true])&] [s2;%% Same as ProcessTab(false).&] [s3;%% &] [s4; &] +[s5;:TextCtrl`:`:ProcessEnter`(bool`): [_^TextCtrl^ TextCtrl][@(0.0.255) `&]_[* ProcessEnte +r]([@(0.0.255) bool]_[*@3 b]_`=_[@(0.0.255) true])&] +[s2;%% If active (non`-default), widget accepts K`_ENTER keystrokes +(inserts a new line).&] +[s3;%% &] +[s4; &] +[s5;:TextCtrl`:`:NoProcessEnter`(`): [_^TextCtrl^ TextCtrl][@(0.0.255) `&]_[* NoProcessEnte +r]()&] +[s2;%% Same as ProcessEnter(false).&] +[s3; &] +[s4; &] [s5;:TextCtrl`:`:NoBackground`(bool`): [_^TextCtrl^ TextCtrl][@(0.0.255) `&]_[* NoBackgroun d]([@(0.0.255) bool]_[*@3 b]_`=_[@(0.0.255) true])&] [s2;%% Sets the widget into transparent mode `- background is not diff --git a/uppsrc/Oracle/Oci8.cpp b/uppsrc/Oracle/Oci8.cpp index 31d82736f..fb0e57b13 100644 --- a/uppsrc/Oracle/Oci8.cpp +++ b/uppsrc/Oracle/Oci8.cpp @@ -727,6 +727,10 @@ bool OCI8Connection::GetColumnInfo() { ii.type = STRING_V; AddColumn(SQLT_STR, 64); break; + case SQLT_TIMESTAMP: // type 187 + ii.type = STRING_V; + AddColumn(SQLT_STR, 30); + break; default: ii.type = STRING_V; AddColumn(SQLT_STR, ii.width ? ii.width + 1 : longsize);