From b2af542ae8896223901f621d96bf62a3891f22bd Mon Sep 17 00:00:00 2001
From: Pritpal Bedi <bedipritpal@hotmail.com>
Date: Wed, 18 Jan 2012 20:02:05 +0000
Subject: [PATCH] 2012-01-18 11:59 UTC-0800 Pritpal Bedi
 (bedipritpal@hotmail.com)   * contrib/gtwvg/tests/demowvg.prg     * Fixed:
 some artifacts.   * contrib/gtwvg/tests/wvgtbrowser.prg     * Fixed: browser
 movements in relation to scrollbars.

---
 harbour/ChangeLog                           |  6 ++++
 harbour/contrib/gtwvg/tests/demowvg.prg     |  9 ++----
 harbour/contrib/gtwvg/tests/wvgtbrowser.prg | 36 ++++++++++++---------
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b29d4f54e0..af6f3740ec 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-01-18 11:59 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/gtwvg/tests/demowvg.prg
+    * Fixed: some artifacts.
+  * contrib/gtwvg/tests/wvgtbrowser.prg
+    * Fixed: browser movements in relation to scrollbars.
+
 2012-01-17 18:07 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbqt/qtgui/qth/filelist.hbm
     + Added: new following classes.
diff --git a/harbour/contrib/gtwvg/tests/demowvg.prg b/harbour/contrib/gtwvg/tests/demowvg.prg
index 07cc63b224..93d8e99626 100644
--- a/harbour/contrib/gtwvg/tests/demowvg.prg
+++ b/harbour/contrib/gtwvg/tests/demowvg.prg
@@ -172,10 +172,7 @@ PROCEDURE Main()
    @ 17, nColGet GET cAdd3
    @ 17, 61      GET nSlry PICTURE "@Z 9999999.99"
 
-#if 0   /* Suitable when whole window is subject to this protocol */
-   aEval( GetList, {|oGet| Wvg_BoxGet( oGet:Row, oGet:Col, Len( Transform( oGet:VarGet(), oGet:Picture ) ) ) } )
-   SetAppWindow():refresh()
-#endif
+   WvgSetAppWindow():refresh()
 
    READ
 
@@ -197,7 +194,7 @@ PROCEDURE Main()
 
 //-------------------------------------------------------------------//
 
-Function HB_GTSYS()
+FUNCTION HB_GTSYS()
    REQUEST HB_GT_WVG_DEFAULT
    REQUEST HB_GT_WVT
    REQUEST HB_GT_WGU
@@ -391,7 +388,7 @@ FUNCTION WvtPartialScreen()
 
 //-------------------------------------------------------------------//
 
-function WvtLines()
+FUNCTION WvtLines()
    LOCAL scr        := SaveScreen( 0,0,maxrow(),maxcol() )
    LOCAL clr        := SetColor( "N/W" )
    LOCAL nRows      := maxrow()
diff --git a/harbour/contrib/gtwvg/tests/wvgtbrowser.prg b/harbour/contrib/gtwvg/tests/wvgtbrowser.prg
index ca8d383533..174b53b8f9 100644
--- a/harbour/contrib/gtwvg/tests/wvgtbrowser.prg
+++ b/harbour/contrib/gtwvg/tests/wvgtbrowser.prg
@@ -359,7 +359,7 @@ STATIC FUNCTION BrwBuildListBox( oCrt, oBrw )
    FOR i := 1 TO oBrw:colCount
       oXbp:addItem( oBrw:getColumn( i ):heading )
    NEXT
-   oXbp:setData( 3 )
+   oXbp:setData( 1 )
    oXbp:tooltipText := "Click on a field name to make it active!"
 
    RETURN oXbp
@@ -394,7 +394,6 @@ STATIC FUNCTION BrwBuildListBoxIdx( oCrt, oBrw )
    FOR i := 1 TO len( aIdx )
       oXbp:addItem( aIdx[ i ] )
    NEXT
-   oXbp:setData( 3 )
    oXbp:tooltipText := "Click on an index to order database!"
 
    RETURN oXbp
@@ -442,7 +441,7 @@ STATIC FUNCTION BrwBuildNvg( oCrt, oBrw, oCom )
    oXbp:setColorFG( "N"  )
    oXbp:setColorBG( "BG+"  )
    oXbp:returnPressed := {|m1,m2,o| m1:=m2, oCom:navigate( trim( o:getData() ) ) }
-   oXbp:tooltipText := "Type in a http:// address and press ENTER"
+   oXbp:tooltipText := "Type-in a http:// address and press ENTER"
    oXbp:setData( "http://hbide.vouch.info/" )
 
    RETURN { oLbl, oXbp }
@@ -534,14 +533,14 @@ STATIC FUNCTION BrwBuildButtons( oCrt, oBrw )
 FUNCTION Vou_BrwAddScrollBars( oCrt, oBrw, oVBar, oHBar )
 
    oHBar := WvgScrollBar():new( oCrt, , { {|| -( oBrw:nBottom+1 ) }, {|| -( oBrw:nLeft ) } }, ;
-                                         { -1, {|| -( oBrw:nRight - oBrw:nLeft + 1 ) } } )
+                                        { -1, {|| -( oBrw:nRight - oBrw:nLeft + 1 ) } } )
    oHBar:range := { 1, oBrw:colCount }
    oHBar:type  := WVGSCROLL_HORIZONTAL
    oHBar:create()
-   oHBar:scroll := {|mp1| oBrw:colPos := mp1[ 1 ], oBrw:refreshAll(), oBrw:forceStable() }
+   oHBar:scroll := {|mp1| oBrw:colPos := mp1[ 1 ], oBrw:refreshCurrent(), oBrw:forceStable() }
 
    oVBar := WvgScrollBar():new( oCrt, , { {|| -( oBrw:nTop ) }, {|| -( oBrw:nRight+1 ) } }, ;
-                                     { {|| -( oBrw:nBottom-oBrw:nTop+1 ) }, {|| -( 2 ) } } )
+                                        { {|| -( oBrw:nBottom-oBrw:nTop+1 ) }, {|| -( 2 ) } } )
    oVBar:range := { 1, LastRec() }
    oVBar:type  := WVGSCROLL_VERTICAL
    oVBar:create()
@@ -832,12 +831,16 @@ STATIC FUNCTION Vou_ExecTBarAction( oBtn )
 /*----------------------------------------------------------------------*/
 
 FUNCTION Vou_BrwSetVScroll( mp1, oBrowse )
-   LOCAL nCmd, nPos
 
-   nCmd := mp1[ 2 ]
-   nPos := mp1[ 1 ]
+   SWITCH mp1[ 2 ]
 
-   SWITCH nCmd
+   CASE WVGSB_TOP
+      oBrowse:goTop()
+      EXIT
+
+   CASE WVGSB_BOTTOM
+      oBrowse:goBottom()
+      EXIT
 
    CASE WVGSB_NEXTPOS
       oBrowse:down()
@@ -848,15 +851,17 @@ FUNCTION Vou_BrwSetVScroll( mp1, oBrowse )
       EXIT
 
    CASE WVGSB_NEXTPAGE
-      oBrowse:pageDown()
+      OrdKeyGoTo( mp1[ 1 ] )
+      oBrowse:refreshAll()
       EXIT
 
    CASE WVGSB_PREVPAGE
-      oBrowse:pageUp()
+      OrdKeyGoTo( mp1[ 1 ] )
+      oBrowse:refreshAll()
       EXIT
 
-   CASE WVGSB_SLIDERTRACK
-      OrdKeyGoTo( nPos )
+   CASE WVGSB_ENDTRACK
+      OrdKeyGoTo( mp1[ 1 ] )
       oBrowse:refreshAll()
       EXIT
 
@@ -864,7 +869,8 @@ FUNCTION Vou_BrwSetVScroll( mp1, oBrowse )
 
    oBrowse:forceStable()
 
-   RETURN nil
+   RETURN NIL
+
 
 /*----------------------------------------------------------------------*/
 /*                   For brosers inside WvtDialog()                     */