2016-04-18 17:33 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

* contrib/gtqtc/gtqtc1.cpp
  * src/rtl/gtwin/gtwin.c
  * src/rtl/gtwvt/gtwvt.c
    ! changed extended keycodes generated for ASCII characters
      combined with ALT and/or CTRL flags. It fixes problems with
      code giving the highest priority for:
         ! hb_keyChar( nKey ) == ""
      i.e. MemoEdit()

  * contrib/hbmzip/mziperr.prg
    % replaced DO CASE / ENDCASE with SWITCH / ENDSWITCH
    ! fixed repeated error codes
This commit is contained in:
Przemysław Czerpak
2016-04-18 17:33:43 +02:00
parent 7ab8ae631d
commit 7d1b59482d
5 changed files with 55 additions and 36 deletions

View File

@@ -1563,6 +1563,8 @@ 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 )

View File

@@ -2605,12 +2605,16 @@ static HB_BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam,
#if defined( UNICODE )
if( iKey >= 127 )
iKey = HB_INKEY_NEW_UNICODEF( iKey, iFlags );
else if( iFlags && ( HB_KF_CTRL | HB_KF_ALT ) )
iKey = HB_INKEY_NEW_KEY( iKey, iFlags );
else
iKey = HB_INKEY_NEW_CHARF( iKey, iFlags );
#else
int u = HB_GTSELF_KEYTRANS( pWVT->pGT, iKey );
if( u )
iKey = HB_INKEY_NEW_UNICODEF( u, iFlags );
else if( iKey < 127 && ( iFlags && ( HB_KF_CTRL | HB_KF_ALT ) ) )
iKey = HB_INKEY_NEW_KEY( iKey, iFlags );
else
{
if( pWVT->CodePage == OEM_CHARSET )