From 156bccb4617f02fe94abd5bea637f218468f11ae Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 25 Apr 2011 01:34:07 +0000 Subject: [PATCH] 2011-04-25 03:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/rtl/gtwvt/gtwvt.c ! Fixed HB_GTI_ICONFILE not working with "certain" .ico files. * contrib/hbqt/hbqt_common.hbc + added libpath for beos [Tamasz Tevesz] --- harbour/ChangeLog | 7 +++++++ harbour/contrib/hbqt/hbqt_common.hbc | 1 + harbour/src/rtl/gtwvt/gtwvt.c | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0cf8708bc9..c9bd2fd02b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2011-04-25 03:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * src/rtl/gtwvt/gtwvt.c + ! Fixed HB_GTI_ICONFILE not working with "certain" .ico files. + + * contrib/hbqt/hbqt_common.hbc + + added libpath for beos [Tamasz Tevesz] + 2011-04-24 10:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! fixed "cross-talk" in compiler options between C and C++ diff --git a/harbour/contrib/hbqt/hbqt_common.hbc b/harbour/contrib/hbqt/hbqt_common.hbc index 21ab0723a9..8165ccb568 100644 --- a/harbour/contrib/hbqt/hbqt_common.hbc +++ b/harbour/contrib/hbqt/hbqt_common.hbc @@ -15,6 +15,7 @@ incpaths=. plugins=hbmk2_qt.hbs {msvc}ldflags=-nodefaultlib:msvcrt.lib -defaultlib:libcmt.lib +{beos}ldflags=-L/boot/common/lib {allwin|os2}libpaths=${HB_WITH_QT}\..\lib diff --git a/harbour/src/rtl/gtwvt/gtwvt.c b/harbour/src/rtl/gtwvt/gtwvt.c index ef9da54038..378677b229 100644 --- a/harbour/src/rtl/gtwvt/gtwvt.c +++ b/harbour/src/rtl/gtwvt/gtwvt.c @@ -2542,7 +2542,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) pWVT->bIconToFree = HB_TRUE; pWVT->hIcon = ( HICON ) LoadImage( ( HINSTANCE ) NULL, HB_ITEMGETSTR( pInfo->pNewVal, &hImageName, NULL ), - IMAGE_ICON, 0, 0, LR_LOADFROMFILE ); + IMAGE_ICON, 0, 0, LR_LOADFROMFILE | LR_DEFAULTSIZE ); hb_strfree( hImageName ); if( pWVT->hWnd ) {