From 7d513fad62bb2ac560bb36879e4442eedcf7f6bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Tue, 19 Apr 2016 14:49:11 +0200 Subject: [PATCH] 2016-04-19 14:49 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/rtl/gtwin/gtwin.c ! fixed wrong translation in my previous commit --- ChangeLog.txt | 4 ++++ src/rtl/gtwin/gtwin.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index a5af5e07c1..61994a1698 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,10 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2016-04-19 14:49 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * src/rtl/gtwin/gtwin.c + ! fixed wrong translation in my previous commit + 2016-04-18 18:41 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * contrib/gtqtc/gtqtc1.cpp * src/rtl/gtwin/gtwin.c diff --git a/src/rtl/gtwin/gtwin.c b/src/rtl/gtwin/gtwin.c index ab3e48f7e8..187c5fd509 100644 --- a/src/rtl/gtwin/gtwin.c +++ b/src/rtl/gtwin/gtwin.c @@ -1563,8 +1563,6 @@ static int hb_gt_win_ReadKey( PHB_GT pGT, int iEventMask ) iChar += 'A' - 1; iKey = HB_INKEY_NEW_KEY( iChar, iFlags ); } - else if( iKey < 127 && ( iFlags & ( HB_KF_CTRL | HB_KF_ALT ) ) ) - iKey = HB_INKEY_NEW_KEY( iKey, iFlags ); else if( iChar != 0 ) { #if defined( UNICODE ) @@ -1575,6 +1573,8 @@ static int hb_gt_win_ReadKey( PHB_GT pGT, int iEventMask ) if( u ) iKey = HB_INKEY_NEW_UNICODEF( u, iFlags ); #endif + else if( iChar < 127 && ( iFlags & ( HB_KF_CTRL | HB_KF_ALT ) ) ) + iKey = HB_INKEY_NEW_KEY( iChar, iFlags ); else iKey = HB_INKEY_NEW_CHARF( iChar, iFlags ); }