From 00a802ac7b75efcba041cee9e61241c58ab6f5df Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Tue, 18 Nov 2008 08:45:54 +0000 Subject: [PATCH] 2008-11-18 00:43 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * harbour/contrib/gtwvg/wvggui.c * harbour/contrib/gtwvg/common.mak * harbour/contrib/gtwvg/wvgdlg.prg * harbour/contrib/gtwvg/wvgwnd.prg ! Minor typos - strict Harbour code quality warnings. --- harbour/ChangeLog | 7 ++ harbour/contrib/gtwvg/common.mak | 2 +- harbour/contrib/gtwvg/wvgdlg.prg | 3 + harbour/contrib/gtwvg/wvggui.c | 19 +++-- harbour/contrib/gtwvg/wvgwnd.prg | 136 +------------------------------ 5 files changed, 25 insertions(+), 142 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7e833a0dfd..f441947b1b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -9,6 +9,13 @@ */ +2008-11-18 00:43 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * harbour/contrib/gtwvg/wvggui.c + * harbour/contrib/gtwvg/common.mak + * harbour/contrib/gtwvg/wvgdlg.prg + * harbour/contrib/gtwvg/wvgwnd.prg + ! Minor typos - strict Harbour code quality warnings. + 2008-11-17 23:59 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * harbour/contrib/gtwvg/Makefile * harbour/contrib/gtwvg/common.mak diff --git a/harbour/contrib/gtwvg/common.mak b/harbour/contrib/gtwvg/common.mak index 1745802280..abffc37311 100644 --- a/harbour/contrib/gtwvg/common.mak +++ b/harbour/contrib/gtwvg/common.mak @@ -17,7 +17,7 @@ LIB_OBJS = \ $(OBJ_DIR)wvgwnd$(OBJEXT) \ $(OBJ_DIR)wvgcrt$(OBJEXT) \ $(OBJ_DIR)wvgax$(OBJEXT) \ - $(OBJ_DIR)wvgdlg$(OBJEXT) \ + $(OBJ_DIR)wvgdlg$(OBJEXT) \ \ $(OBJ_DIR)gtwvg$(OBJEXT) \ $(OBJ_DIR)wvgcore$(OBJEXT) \ diff --git a/harbour/contrib/gtwvg/wvgdlg.prg b/harbour/contrib/gtwvg/wvgdlg.prg index 4769cf2746..de38d7f467 100644 --- a/harbour/contrib/gtwvg/wvgdlg.prg +++ b/harbour/contrib/gtwvg/wvgdlg.prg @@ -140,6 +140,9 @@ METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgDi RETURN Self //----------------------------------------------------------------------// METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS WvgDialog + + ::WvgWindow:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) + RETURN Self //----------------------------------------------------------------------// METHOD destroy() CLASS WvgDialog diff --git a/harbour/contrib/gtwvg/wvggui.c b/harbour/contrib/gtwvg/wvggui.c index e61137f5bb..3a72ce159f 100644 --- a/harbour/contrib/gtwvg/wvggui.c +++ b/harbour/contrib/gtwvg/wvggui.c @@ -1606,8 +1606,6 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) case HB_GTI_SCREENSIZE: { - int iX, iY; - if( !pInfo->pResult ) { pInfo->pResult = hb_itemNew( NULL ); @@ -1616,14 +1614,17 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) hb_arraySetNI( pInfo->pResult, 2, pWVT->PTEXTSIZE.y * pWVT->ROWS ); hb_arraySetNI( pInfo->pResult, 1, pWVT->PTEXTSIZE.x * pWVT->COLS ); #if 0 - iY = hb_arrayGetNI( pInfo->pNewVal,2 ); - iX = hb_arrayGetNI( pInfo->pNewVal,1 ); - if( iY > 0 ) { - BOOL bOldCentre = pWVT->CentreWindow; - pWVT->CentreWindow = pWVT->bMaximized ? TRUE : FALSE; - HB_GTSELF_SETMODE( pGT, ( USHORT ) ( iY / pWVT->PTEXTSIZE.y ), ( USHORT ) ( iX / pWVT->PTEXTSIZE.x ) ); - pWVT->CentreWindow = bOldCentre; + int iX, iY; + iY = hb_arrayGetNI( pInfo->pNewVal,2 ); + iX = hb_arrayGetNI( pInfo->pNewVal,1 ); + if( iY > 0 ) + { + BOOL bOldCentre = pWVT->CentreWindow; + pWVT->CentreWindow = pWVT->bMaximized ? TRUE : FALSE; + HB_GTSELF_SETMODE( pGT, ( USHORT ) ( iY / pWVT->PTEXTSIZE.y ), ( USHORT ) ( iX / pWVT->PTEXTSIZE.x ) ); + pWVT->CentreWindow = bOldCentre; + } } #endif break; diff --git a/harbour/contrib/gtwvg/wvgwnd.prg b/harbour/contrib/gtwvg/wvgwnd.prg index f41a88180d..55e2c8049f 100644 --- a/harbour/contrib/gtwvg/wvgwnd.prg +++ b/harbour/contrib/gtwvg/wvgwnd.prg @@ -93,17 +93,6 @@ CLASS WvgWindow INHERIT WvgPartHandler DATA helpLink DATA tooltipText INIT '' - DATA style INIT 0 - DATA exStyle INIT 0 - DATA hWnd - DATA aPos INIT { 0,0 } - DATA aSize INIT { 0,0 } - DATA aPresParams INIT {} - DATA objType INIT objTypeNone - DATA ClassName INIT '' - DATA title INIT ' ' - DATA icon INIT 0 - // CALLBACK SLOTS DATA sl_enter DATA sl_leave @@ -220,7 +209,9 @@ EXPORTED: METHOD setDisplayFocus() SETGET METHOD killDisplayFocus() SETGET - // HARBOUR implementation + + DATA title INIT ' ' + DATA icon INIT 0 DATA closable INIT .T. DATA resizable INIT .t. DATA resizeMode INIT 0 @@ -230,9 +221,8 @@ EXPORTED: DATA pGTp DATA pGT DATA objType INIT objTypeNone - DATA ClassName INIT '' + DATA className INIT '' - METHOD notifier() METHOD setFocus() METHOD sendMessage() @@ -1027,125 +1017,7 @@ METHOD dragDrop( xParam, xParam1 ) CLASS WvgWindow RETURN Self //----------------------------------------------------------------------// -// HARBOUR SPECIFIC -//----------------------------------------------------------------------// -METHOD notifier( nEvent, xParams ) CLASS WvgWindow - Local aPos, nReturn := 0 - - DO CASE - - CASE nEvent == HB_GTE_MOUSE - if xParams[ 1 ] == WM_MOUSEHOVER - aPos := { xParams[ 3 ], xParams[ 4 ] } - elseif xParams[ 1 ] == WM_MOUSELEAVE - // Nothing - else - aPos := if( ::mouseMode == 2, { xParams[ 3 ], xParams[ 4 ] }, { xParams[ 5 ], xParams[ 6 ] } ) - endif - - SWITCH xParams[ 1 ] - - case WM_MOUSEHOVER - if hb_isBlock( ::sl_enter ) - eval( ::sl_enter, aPos, NIL, self ) - endif - EXIT - case WM_MOUSELEAVE - if hb_isBlock( ::sl_leave ) - eval( ::sl_leave, aPos, NIL, self ) - endif - EXIT - case WM_RBUTTONDOWN - if hb_isBlock( ::sl_rbDown ) - eval( ::sl_rbDown, aPos, NIL, self ) - endif - EXIT - case WM_LBUTTONDOWN - if hb_isBlock( ::sl_lbDown ) - eval( ::sl_lbDown, aPos, NIL, self ) - endif - EXIT - case WM_RBUTTONUP //// - if hb_isBlock( ::sl_rbUp ) - eval( ::sl_rbUp, aPos, NIL, self ) - endif - EXIT - case WM_LBUTTONUP //// - if hb_isBlock( ::sl_lbUp ) - eval( ::sl_lbUp, aPos, NIL, self ) - endif - EXIT - case WM_RBUTTONDBLCLK - if hb_isBlock( ::sl_rbDblClick ) - eval( ::sl_rbDblClick, aPos, NIL, self ) - endif - EXIT - case WM_LBUTTONDBLCLK - if hb_isBlock( ::sl_lbDblClick ) - eval( ::sl_lbDblClick, aPos, NIL, self ) - endif - EXIT - case WM_MBUTTONDOWN - if hb_isBlock( ::sl_mbDown ) - eval( ::sl_mbDown, aPos, NIL, self ) - endif - EXIT - case WM_MBUTTONUP //// - if hb_isBlock( ::sl_mbClick ) - eval( ::sl_mbClick, aPos, NIL, self ) - endif - EXIT - case WM_MBUTTONDBLCLK - if hb_isBlock( ::sl_mbDblClick ) - eval( ::sl_mbDblClick, aPos, NIL, self ) - endif - EXIT - case WM_MOUSEMOVE - if hb_isBlock( ::sl_motion ) - eval( ::sl_motion, aPos, NIL, self ) - endif - EXIT - case WM_MOUSEWHEEL - if hb_isBlock( ::sl_wheel ) - eval( ::sl_wheel, aPos, NIL, self ) - endif - EXIT - case WM_NCMOUSEMOVE - EXIT - END - - CASE nEvent == HB_GTE_KEYBOARD - if hb_isBlock( ::keyboard ) - eval( ::keyboard, xParams, NIL, Self ) - endif - - CASE nEvent == HB_GTE_SETFOCUS - if hb_isBlock( ::setInputFocus ) - eval( ::setInputFocus, NIL, NIL, Self ) - endif - ::lHasInputFocus := .t. - - CASE nEvent == HB_GTE_KILLFOCUS - if hb_isBlock( ::killInputFocus ) - eval( ::killInputFocus, NIL, NIL, Self ) - endif - ::lHasInputFocus := .f. - - CASE nEvent == HB_GTE_RESIZED - if hb_isBlock( ::sl_resize ) - eval( ::sl_resize, { xParams[ 1 ], xParams[ 2 ] }, { xParams[ 3 ], xParams[ 4 ] }, Self ) - endif - - CASE nEvent == HB_GTE_CLOSE - if hb_isBlock( ::close ) - nReturn := eval( ::close, NIL, NIL, Self ) - endif - - ENDCASE - - RETURN nReturn -//----------------------------------------------------------------------// METHOD setFocus() CLASS WvgWindow ::sendMessage( WM_ACTIVATE, 1, 0 )