From 798e1081edecc49ceb9b20b8788fecc7a43d8bf0 Mon Sep 17 00:00:00 2001 From: "jmcquintas@gmail.com" Date: Wed, 22 Feb 2023 16:31:15 -0300 Subject: [PATCH] Modify wvg_LoadImage() to add resize parameters --- contrib/gtwvg/wvgwin.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/gtwvg/wvgwin.c b/contrib/gtwvg/wvgwin.c index c968e24a07..2cc0606643 100644 --- a/contrib/gtwvg/wvgwin.c +++ b/contrib/gtwvg/wvgwin.c @@ -316,6 +316,7 @@ HB_FUNC( WVG_LOADIMAGE ) { HANDLE hImage = 0; void * hBuffer; + void * hString = NULL; LPCTSTR lpBuffer = HB_PARSTR( 1, &hBuffer, NULL ); int iSource = hb_parni( 2 ); @@ -323,16 +324,16 @@ HB_FUNC( WVG_LOADIMAGE ) { case 0: /* Image from resource by numeric id */ if( HB_ISNUM( 3 ) && hb_parni( 3 ) == IMAGE_ICON ) - hImage = LoadIcon( ( HINSTANCE ) wvg_hInstance(), MAKEINTRESOURCE( hb_parni( 1 ) ) ); + hImage = ( HICON ) LoadImage( ( HINSTANCE ) wvg_hInstance(), MAKEINTRESOURCE( hb_parni( 1 ) ), IMAGE_ICON, hb_parni( 4 ), hb_parni( 5 ), LR_DEFAULTSIZE ); else - hImage = LoadBitmap( ( HINSTANCE ) wvg_hInstance(), MAKEINTRESOURCE( hb_parni( 1 ) ) ); + hImage = ( HBITMAP ) LoadImage( ( HINSTANCE ) wvg_hInstance(), MAKEINTRESOURCE( hb_parni( 1 ) ), IMAGE_BITMAP, hb_parni( 4 ), hb_parni( 5 ), LR_DEFAULTSIZE ); break; case 1: /* image from resource by name */ if( HB_ISNUM( 3 ) && hb_parni( 3 ) == IMAGE_ICON ) - hImage = LoadIcon( ( HINSTANCE ) wvg_hInstance(), lpBuffer ); + hImage = ( HICON ) LoadImage( ( HINSTANCE ) wvg_hInstance(), HB_PARSTR( 1, &hString, NULL ), IMAGE_ICON, hb_parni( 4 ), hb_parni( 5 ), LR_DEFAULTSIZE ); else - hImage = LoadBitmap( ( HINSTANCE ) wvg_hInstance(), lpBuffer ); + hImage = ( HBITMAP ) LoadImage( ( HINSTANCE ) wvg_hInstance(), HB_PARSTR( 1, &hString, NULL ), IMAGE_BITMAP, hb_parni( 4 ), hb_parni( 5 ), LR_DEFAULTSIZE ); break; case 2: /* Image from disk file */