fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2015-11-03 10:44 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* 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
This commit is contained in:
Przemysław Czerpak
2015-11-03 10:44:29 +01:00
parent ef13a4a651
commit 9c5f875a7a
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog.txt
View File

@@ -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

4
src/rtl/gtwin/gtwin.c
View File

@@ -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

7
src/rtl/gtwvt/gtwvt.c
View File

@@ -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 ) );

10
tests/gtkeys.prg
View File

@@ -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 )