From e2ebc916a9ff666c077eb28d3d1b8420680f6f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Sun, 19 Apr 2020 16:32:11 +0200 Subject: [PATCH] 2020-04-19 16:32 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * contrib/hbct/dattime2.c % minor optimization * src/rdd/dbsql.c ; added somment with syntax info * include/inkey.ch * src/rtl/hbgtcore.c + added support for mouse wheel left and right events to base GT code --- ChangeLog.txt | 11 +++++++++++ contrib/hbct/dattime2.c | 4 ++-- include/inkey.ch | 2 ++ src/rdd/dbsql.c | 3 +++ src/rtl/hbgtcore.c | 4 ++++ 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 7ef01dd685..8326d440f3 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,17 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ +2020-04-19 16:32 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * contrib/hbct/dattime2.c + % minor optimization + + * src/rdd/dbsql.c + ; added somment with syntax info + + * include/inkey.ch + * src/rtl/hbgtcore.c + + added support for mouse wheel left and right events to base GT code + 2020-04-19 16:00 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/vm/dynsym.c * src/vm/task.c diff --git a/contrib/hbct/dattime2.c b/contrib/hbct/dattime2.c index fc98953d0e..f6a5ee91df 100644 --- a/contrib/hbct/dattime2.c +++ b/contrib/hbct/dattime2.c @@ -62,8 +62,8 @@ static HB_BOOL ct_isleap( int iYear ) { - return iYear != 0 && ( ( ( iYear & 3 ) == 0 && iYear % 100 != 0 ) || - iYear % 400 == 0 ); + return iYear != 0 && ( iYear & 3 ) == 0 && + ( iYear % 100 != 0 || iYear % 400 == 0 ); } static int ct_daysinmonth( int iMonth, HB_BOOL bLeap ) diff --git a/include/inkey.ch b/include/inkey.ch index 91207d59e2..06f53f5b3a 100644 --- a/include/inkey.ch +++ b/include/inkey.ch @@ -88,6 +88,8 @@ #define K_MWFORWARD 1014 /* Mouse Wheel Forward */ #define K_MWBACKWARD 1015 /* Mouse Wheel Backward */ #define K_NCMOUSEMOVE 1016 /* Non-Client Area Mouse Movement */ +#define K_MWLEFT 1017 /* Mouse Wheel Left */ +#define K_MWRIGHT 1018 /* Mouse Wheel Right */ #define K_MINMOUSE 1001 #define K_MAXMOUSE 1016 diff --git a/src/rdd/dbsql.c b/src/rdd/dbsql.c index 9820d3fc82..845ca9d957 100644 --- a/src/rdd/dbsql.c +++ b/src/rdd/dbsql.c @@ -343,6 +343,9 @@ static HB_ULONG hb_db2Sql( AREAP pArea, PHB_ITEM pFields, HB_MAXINT llNext, return ulRecords; } +/* __dbSQL( .T., , , [], [], ; + [], [], [], [], [], ; + [], [], [], [] ) -> */ HB_FUNC( __DBSQL ) { AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); diff --git a/src/rtl/hbgtcore.c b/src/rtl/hbgtcore.c index 005e1f8e87..b7b1f164bc 100644 --- a/src/rtl/hbgtcore.c +++ b/src/rtl/hbgtcore.c @@ -2679,6 +2679,8 @@ static int hb_gt_def_InkeyFilter( PHB_GT pGT, int iKey, int iEventMask ) break; case K_MWFORWARD: case K_MWBACKWARD: + case K_MWLEFT: + case K_MWRIGHT: iMask = INKEY_MWHEEL; break; default: @@ -2720,6 +2722,8 @@ static int hb_gt_def_InkeyFilter( PHB_GT pGT, int iKey, int iEventMask ) break; case K_MWFORWARD: case K_MWBACKWARD: + case K_MWLEFT: + case K_MWRIGHT: iMask = INKEY_MWHEEL; break; case HB_K_RESIZE: