diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d8c6f6ba2a..b86f884363 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-05-23 10:30 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+   * contrib/gtwvg/tests/demowvg.prg
+   * contrib/gtwvg/wvtclass.prg
+     + TBrowseWVT class moved to contrib core, to make it 
+       available for all WVT apps.
+
 2008-05-22 19:00 UTC+0800 Pritpal Bedi (pritpal@vouchcac.com)
   * harbour/contrib/gtwvg/tests/demowvg.prg
     + CLASS TBrowseWVG FROM TBrowse
diff --git a/harbour/contrib/gtwvg/tests/demowvg.prg b/harbour/contrib/gtwvg/tests/demowvg.prg
index 18a951a80a..82536eed87 100644
--- a/harbour/contrib/gtwvg/tests/demowvg.prg
+++ b/harbour/contrib/gtwvg/tests/demowvg.prg
@@ -2095,69 +2095,3 @@ FUNCTION DrawSlide( hDlg, nSlide )
    Win_ReleaseDC( hDlg,hDC )
 
    Return nil
-
-//-------------------------------------------------------------------//
-//-------------------------------------------------------------------//
-//-------------------------------------------------------------------//
-//
-//                      TBrowseWVG From TBrowse
-//
-//-------------------------------------------------------------------//
-//-------------------------------------------------------------------//
-//-------------------------------------------------------------------//
-
-#include "hbclass.ch"
-
-#define _TBCI_COLOBJECT       1   // column object
-#define _TBCI_COLWIDTH        2   // width of the column
-#define _TBCI_COLPOS          3   // column position on screen
-#define _TBCI_CELLWIDTH       4   // width of the cell
-#define _TBCI_CELLPOS         5   // cell position in column
-#define _TBCI_COLSEP          6   // column separator
-#define _TBCI_SEPWIDTH        7   // width of the separator
-#define _TBCI_HEADING         8   // column heading
-#define _TBCI_FOOTING         9   // column footing
-#define _TBCI_HEADSEP        10   // heading separator
-#define _TBCI_FOOTSEP        11   // footing separator
-#define _TBCI_DEFCOLOR       12   // default color
-#define _TBCI_FROZENSPACE    13   // space after frozen columns
-#define _TBCI_LASTSPACE      14   // space after last visible column
-#define _TBCI_SIZE           14   // size of array with TBrowse column data
-
-//-------------------------------------------------------------------//
-
-CLASS TBrowseWVG FROM TBrowse
-
-   ACCESS aColumnsSep        INLINE ::ColumnsSep()
-
-   METHOD ColumnsSep()
-
-   ENDCLASS
-
-//-------------------------------------------------------------------//
-
-METHOD ColumnsSep()
-   Local aSep := {}
-   Local lFirst, aCol, nColPos
-
-   lFirst := .T.
-   FOR EACH aCol IN ::aColData
-      IF aCol[ _TBCI_COLPOS ] != NIL
-         IF lFirst
-            lFirst := .F.
-
-         ELSE
-            nColPos := aCol[ _TBCI_COLPOS ]
-
-            IF aCol[ _TBCI_SEPWIDTH ] > 0
-               nColPos += Int( aCol[ _TBCI_SEPWIDTH ]/2 )
-            ENDIF
-
-            aadd( aSep, nColPos )
-         ENDIF
-      ENDIF
-   NEXT
-
-   Return aSep
-
-//----------------------------------------------------------------------//
diff --git a/harbour/contrib/gtwvg/wvtclass.prg b/harbour/contrib/gtwvg/wvtclass.prg
index 88e01445db..b7ee3c5a6f 100644
--- a/harbour/contrib/gtwvg/wvtclass.prg
+++ b/harbour/contrib/gtwvg/wvtclass.prg
@@ -3512,4 +3512,63 @@ METHOD Box( nRow, nCol, n2Row, n2Col, cBoxChars, cColor ) CLASS WvtConsole
 //-------------------------------------------------------------------//
 //-------------------------------------------------------------------//
 //-------------------------------------------------------------------//
+//
+//                      TBrowseWVG From TBrowse
+//
+//-------------------------------------------------------------------//
+//-------------------------------------------------------------------//
+//-------------------------------------------------------------------//
 
+#define _TBCI_COLOBJECT       1   // column object
+#define _TBCI_COLWIDTH        2   // width of the column
+#define _TBCI_COLPOS          3   // column position on screen
+#define _TBCI_CELLWIDTH       4   // width of the cell
+#define _TBCI_CELLPOS         5   // cell position in column
+#define _TBCI_COLSEP          6   // column separator
+#define _TBCI_SEPWIDTH        7   // width of the separator
+#define _TBCI_HEADING         8   // column heading
+#define _TBCI_FOOTING         9   // column footing
+#define _TBCI_HEADSEP        10   // heading separator
+#define _TBCI_FOOTSEP        11   // footing separator
+#define _TBCI_DEFCOLOR       12   // default color
+#define _TBCI_FROZENSPACE    13   // space after frozen columns
+#define _TBCI_LASTSPACE      14   // space after last visible column
+#define _TBCI_SIZE           14   // size of array with TBrowse column data
+
+//-------------------------------------------------------------------//
+
+CLASS TBrowseWVG FROM TBrowse
+
+   METHOD aColumnsSep()
+
+   ENDCLASS
+
+//-------------------------------------------------------------------//
+
+METHOD aColumnsSep() CLASS TBrowseWVG
+   Local aSep := {}
+   Local lFirst, aCol, nColPos
+
+   lFirst := .T.
+   FOR EACH aCol IN ::aColData
+      IF aCol[ _TBCI_COLPOS ] != NIL
+         IF lFirst
+            lFirst := .F.
+
+         ELSE
+            nColPos := aCol[ _TBCI_COLPOS ]
+
+            IF aCol[ _TBCI_SEPWIDTH ] > 0
+               nColPos += Int( aCol[ _TBCI_SEPWIDTH ]/2 )
+            ENDIF
+
+            aadd( aSep, nColPos )
+         ENDIF
+      ENDIF
+   NEXT
+
+   Return aSep
+
+//-------------------------------------------------------------------//
+//-------------------------------------------------------------------//
+//-------------------------------------------------------------------//