From 15dbc1c7e3184490ad63ad83cffe2d70bfcefb34 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Sun, 16 Nov 2008 08:05:11 +0000 Subject: [PATCH] 2008-11-15 23:59 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * harbour/contrib/gtwvg/gtwvg.c * harbour/contrib/gtwvg/wvgcrt.prg ! Further tuned up the resizing behavior. Silly typos. --- harbour/ChangeLog | 5 +++++ harbour/contrib/gtwvg/gtwvg.c | 8 ++++---- harbour/contrib/gtwvg/wvgcrt.prg | 11 +++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 67bacac44c..43459ceb24 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-11-15 23:59 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * harbour/contrib/gtwvg/gtwvg.c + * harbour/contrib/gtwvg/wvgcrt.prg + ! Further tuned up the resizing behavior. Silly typos. + 2008-11-15 23:01 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * harbour/contrib/gtwvg/gtwvg.c ! Further tuned up the resizing behavior. diff --git a/harbour/contrib/gtwvg/gtwvg.c b/harbour/contrib/gtwvg/gtwvg.c index b9a943f639..cc32dff4cc 100644 --- a/harbour/contrib/gtwvg/gtwvg.c +++ b/harbour/contrib/gtwvg/gtwvg.c @@ -780,8 +780,8 @@ static BOOL hb_gt_wvt_IsSizeChanged( PHB_GTWVT pWVT ) if( pWVT->bResizable ) { - int iw = pWVT->iGuiWidth; - int ih = pWVT->iGuiHeight; + int iw = pWVT->PTEXTSIZE.x * pWVT->COLS; + int ih = pWVT->PTEXTSIZE.y * pWVT->ROWS; if( pWVT->ResizeMode == HB_GTI_RESIZEMODE_FONT ) bSizeChanged = hb_gt_wvt_FitSize( pWVT ); @@ -795,8 +795,8 @@ static BOOL hb_gt_wvt_IsSizeChanged( PHB_GTWVT pWVT ) hb_arrayNew( pEvParams, 4 ); hb_arraySetNI( pEvParams, 1, iw ); hb_arraySetNI( pEvParams, 2, ih ); - hb_arraySetNI( pEvParams, 3, pWVT->iGuiWidth ); - hb_arraySetNI( pEvParams, 4, pWVT->iGuiHeight ); + hb_arraySetNI( pEvParams, 3, pWVT->PTEXTSIZE.x * pWVT->COLS ); + hb_arraySetNI( pEvParams, 4, pWVT->PTEXTSIZE.y * pWVT->ROWS ); hb_gt_wvt_AddCharToInputQueue( pWVT, HB_K_RESIZE ); hb_gt_wvt_FireEvent( pWVT, HB_GTE_RESIZED, pEvParams ); diff --git a/harbour/contrib/gtwvg/wvgcrt.prg b/harbour/contrib/gtwvg/wvgcrt.prg index 6d8bdc65ce..a3fd9620d7 100644 --- a/harbour/contrib/gtwvg/wvgcrt.prg +++ b/harbour/contrib/gtwvg/wvgcrt.prg @@ -991,12 +991,7 @@ METHOD quit( xParam, xParam1 ) CLASS WvgCrt //----------------------------------------------------------------------// -METHOD resize( xParam, xParam1 ) CLASS WvgCrt - - if hb_isArray( xParam ) .and. hb_isBlock( ::sl_resize ) - eval( ::sl_resize, xParam, xParam1, Self ) - RETURN Self - endif +METHOD resize( xParam ) CLASS WvgCrt if hb_isBlock( xParam ) .or. hb_isNil( xParam ) ::sl_resize := xParam @@ -1208,8 +1203,8 @@ METHOD notifier( nEvent, xParams ) CLASS WvgCrt ::lHasInputFocus := .f. CASE nEvent == HB_GTE_RESIZED - if hb_isBlock( ::resize ) - eval( ::resize, { xParams[ 1 ], xParams[ 2 ] }, { xParams[ 3 ], xParams[ 4 ] }, Self ) + if hb_isBlock( ::sl_resize ) + eval( ::sl_resize, { xParams[ 1 ], xParams[ 2 ] }, { xParams[ 3 ], xParams[ 4 ] }, Self ) endif CASE nEvent == HB_GTE_CLOSE