diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7aaedef7a8..50186ce881 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-10-30 21:24 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * harbour/source/rtl/gtwvt/gtwvt.c + * harbour/source/rtl/gtwvt/gtwvt.h + + Transfereed two static variables to HB_GTWVT structure. + Multi-thread/console protection. + 2008-10-31 02:26 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * make_vc.mak - Removed -GS- option for WinCE. MS recommends this to diff --git a/harbour/contrib/gtwvg/gtwvg.c b/harbour/contrib/gtwvg/gtwvg.c index 1df30ef6fa..ef27e53c69 100644 --- a/harbour/contrib/gtwvg/gtwvg.c +++ b/harbour/contrib/gtwvg/gtwvg.c @@ -2012,6 +2012,7 @@ static void hb_gt_wvt_Exit( PHB_GT pGT ) } hb_gt_wvt_Free( pWVT ); } + //HB_GTSUPER_EXIT( pGT ); } /* ********************************************************************** */ @@ -2922,8 +2923,6 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) { if ( pWVT->pfnLayered ) { - BOOL bGF; - SetWindowLong( pWVT->hWnd, GWL_EXSTYLE, GetWindowLong( pWVT->hWnd, GWL_EXSTYLE ) | WS_EX_LAYERED ); @@ -2931,13 +2930,28 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) pWVT->pfnLayered( pWVT->hWnd, RGB( 255,255,255 ), hb_itemGetNI( pInfo->pNewVal2 ), - LWA_COLORKEY|LWA_ALPHA ); + /*LWA_COLORKEY|*/ LWA_ALPHA ); } break; } } break; } + case HB_GTI_PRESPARAM: + { + if ( ! pWVT->hWnd ) + { + if( hb_itemType( pInfo->pNewVal ) & HB_IT_ARRAY ) + { + int iParam = hb_arrayLength( pInfo->nNewVal ); + if( iParam == HB_GTI_PP_SIZE ) + { + int mode = hb_arrayGetNI( pInfo->pNewVal, 1 ); + } + } + } + break; + } default: return HB_GTSUPER_INFO( pGT, iType, pInfo ); } diff --git a/harbour/contrib/gtwvg/gtwvg.h b/harbour/contrib/gtwvg/gtwvg.h index f8a8d3776d..523ab5c901 100644 --- a/harbour/contrib/gtwvg/gtwvg.h +++ b/harbour/contrib/gtwvg/gtwvg.h @@ -239,6 +239,20 @@ typedef BOOL ( WINAPI *wvtSetLayeredWindowAttributes )( //-------------------------------------------------------------------// +typedef struct +{ + DWORD exStyle; + DWORD style; + int x; + int y; + int width; + int height; + HWND hWndParent; + BOOL bVisible; + BOOL byPixel; + +} HB_GT_PARAM, * PHB_GT_PARAM; + typedef struct { HPEN penWhite; // White pen to draw GDI elements @@ -394,7 +408,9 @@ typedef struct PHB_ITEM pcbFuncModal[ WVT_DLGMD_MAX ]; // codeblock for WndProc int iTypeModal[ WVT_DLGMD_MAX ]; // Type of Function Pointers - Function 1, Block 2, Method 3 - PHB_GUIDATA * pGui; // GUI Data Structure + PHB_GUIDATA * pGUI; // GUI Data Structure + + PHB_GT_PARAM * pPP; // Presentation Parameters } HB_GTWVT, * PHB_GTWVT;