From 9c5f875a7a57f4c5fcd6b9a185ff3dda1775e997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Tue, 3 Nov 2015 10:44:29 +0100 Subject: [PATCH] 2015-11-03 10:44 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/rtl/gtwin/gtwin.c * added workaround for compilers which do not have MOUSE_HWHEELED macro (thanks to Alexey) * src/rtl/gtwvt/gtwvt.c * do not use LR_DEFAULTSIZE in WinCE builds (synced with Viktor's branch) * tests/gtkeys.prg * casing --- ChangeLog.txt | 11 +++++++++++ src/rtl/gtwin/gtwin.c | 4 ++++ src/rtl/gtwvt/gtwvt.c | 7 +++++++ tests/gtkeys.prg | 10 +++++----- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 4bf10df61c..0f1c87b91a 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,17 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2015-11-03 10:44 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * src/rtl/gtwin/gtwin.c + * added workaround for compilers which do not have MOUSE_HWHEELED macro + (thanks to Alexey) + + * src/rtl/gtwvt/gtwvt.c + * do not use LR_DEFAULTSIZE in WinCE builds (synced with Viktor's branch) + + * tests/gtkeys.prg + * casing + 2015-11-02 17:13 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/rtl/gtsln/kbsln.c * tests/inkey.prg diff --git a/src/rtl/gtwin/gtwin.c b/src/rtl/gtwin/gtwin.c index 12facd82fd..6bebd0d857 100644 --- a/src/rtl/gtwin/gtwin.c +++ b/src/rtl/gtwin/gtwin.c @@ -130,6 +130,10 @@ # define MOUSE_WHEELED 0x0004 #endif +#ifndef MOUSE_HWHEELED +# define MOUSE_HWHEELED 0x0008 +#endif + #ifndef CONSOLE_FULLSCREEN_HARDWARE # define CONSOLE_FULLSCREEN_HARDWARE 2 #endif diff --git a/src/rtl/gtwvt/gtwvt.c b/src/rtl/gtwvt/gtwvt.c index ae6d269219..06c511b2ee 100644 --- a/src/rtl/gtwvt/gtwvt.c +++ b/src/rtl/gtwvt/gtwvt.c @@ -3801,10 +3801,17 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) void * hIconName; if( iType == HB_GTI_ICONFILE ) +#if defined( HB_OS_WIN_CE ) + hIcon = hIconToFree = ( HICON ) + LoadImage( ( HINSTANCE ) NULL, + HB_ITEMGETSTR( pInfo->pNewVal, &hIconName, NULL ), + IMAGE_ICON, 0, 0, LR_LOADFROMFILE ); +#else hIcon = hIconToFree = ( HICON ) LoadImage( ( HINSTANCE ) NULL, HB_ITEMGETSTR( pInfo->pNewVal, &hIconName, NULL ), IMAGE_ICON, 0, 0, LR_LOADFROMFILE | LR_DEFAULTSIZE ); +#endif else hIcon = LoadIcon( pWVT->hInstance, HB_ITEMGETSTR( pInfo->pNewVal, &hIconName, NULL ) ); diff --git a/tests/gtkeys.prg b/tests/gtkeys.prg index 02d3b6eeb8..8f3267773c 100644 --- a/tests/gtkeys.prg +++ b/tests/gtkeys.prg @@ -249,11 +249,11 @@ PROCEDURE Main( cTermCP, cHostCP, lBoxChar, lRawKey ) Set( _SET_EVENTMASK, HB_INKEY_ALL + HB_INKEY_EXT ) hb_gtInfo( HB_GTI_CURSORBLINKRATE, 1000 ) hb_gtInfo( HB_GTI_ESCDELAY, 50 ) - // hb_gtinfo( HB_GTI_FONTATTRIBUTE, 0 ) - // hb_gtinfo( HB_GTI_FONTATTRIBUTE, hb_bitOr( HB_GTI_FONTA_DRAWBOX, hb_gtinfo( HB_GTI_FONTATTRIBUTE ) ) ) - // hb_gtinfo( HB_GTI_FONTATTRIBUTE, hb_bitOr( HB_GTI_FONTA_CTRLCHARS, hb_gtinfo( HB_GTI_FONTATTRIBUTE ) ) ) - // hb_gtinfo( HB_GTI_FONTATTRIBUTE, hb_bitOr( HB_GTI_FONTA_FIXMETRIC, hb_gtinfo( HB_GTI_FONTATTRIBUTE ) ) ) - // hb_gtinfo( HB_GTI_FONTATTRIBUTE, hb_bitOr( HB_GTI_FONTA_CLRBKG, hb_gtinfo( HB_GTI_FONTATTRIBUTE ) ) ) + // hb_gtInfo( HB_GTI_FONTATTRIBUTE, 0 ) + // hb_gtInfo( HB_GTI_FONTATTRIBUTE, hb_bitOr( HB_GTI_FONTA_DRAWBOX, hb_gtInfo( HB_GTI_FONTATTRIBUTE ) ) ) + // hb_gtInfo( HB_GTI_FONTATTRIBUTE, hb_bitOr( HB_GTI_FONTA_CTRLCHARS, hb_gtInfo( HB_GTI_FONTATTRIBUTE ) ) ) + // hb_gtInfo( HB_GTI_FONTATTRIBUTE, hb_bitOr( HB_GTI_FONTA_FIXMETRIC, hb_gtInfo( HB_GTI_FONTATTRIBUTE ) ) ) + // hb_gtInfo( HB_GTI_FONTATTRIBUTE, hb_bitOr( HB_GTI_FONTA_CLRBKG, hb_gtInfo( HB_GTI_FONTATTRIBUTE ) ) ) // hb_gtInfo( HB_GTI_RESIZABLE, .F. ) // hb_gtInfo( HB_GTI_RESIZEMODE, HB_GTI_RESIZEMODE_ROWS ) // hb_gtInfo( HB_GTI_RESIZEMODE, HB_GTI_RESIZEMODE_FONT )