harbour · JoseQuintas · Mar 24, 2023
diff --git a/contrib/gtwvg/3state.prg b/contrib/gtwvg/3state.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 #ifndef __DBG_PARTS__
 #xtranslate hb_traceLog( [<x,...>] ) =>

diff --git a/contrib/gtwvg/activex.prg b/contrib/gtwvg/activex.prg
@@ -53,9 +53,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 #ifndef __DBG_PARTS__
 #xtranslate hb_traceLog( [<x,...>] ) =>

diff --git a/contrib/gtwvg/bitmap.prg b/contrib/gtwvg/bitmap.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgBitmap
 

diff --git a/contrib/gtwvg/checkbox.prg b/contrib/gtwvg/checkbox.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgCheckBox INHERIT WvgWindow, WvgDataRef
 

diff --git a/contrib/gtwvg/class.prg b/contrib/gtwvg/class.prg
@@ -53,7 +53,7 @@
 #include "inkey.ch"
 #include "setcurs.ch"
 
-#include "wvtwin.ch"
+#include "gtwvg.ch"
 
 #define K_LBUTTONPRESSED        1021
 #define K_RBUTTONPRESSED        1022

diff --git a/contrib/gtwvg/combobox.prg b/contrib/gtwvg/combobox.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgComboBox INHERIT WvgWindow, WvgDataRef
 

diff --git a/contrib/gtwvg/crt.prg b/contrib/gtwvg/crt.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgCrt INHERIT WvgWindow, WvgPartHandler
 

diff --git a/contrib/gtwvg/dataref.prg b/contrib/gtwvg/dataref.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgDataRef
 

diff --git a/contrib/gtwvg/dialog.prg b/contrib/gtwvg/dialog.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgDialog INHERIT WvgWindow
 

diff --git a/contrib/gtwvg/drawarea.prg b/contrib/gtwvg/drawarea.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgDrawingArea INHERIT WvgWindow
 

diff --git a/contrib/gtwvg/genrc.prg b/contrib/gtwvg/genrc.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 THREAD STATIC t_oCrt
 

diff --git a/contrib/gtwvg/gtwvg.ch b/contrib/gtwvg/gtwvg.ch
@@ -0,0 +1,3 @@
+#include "hbgtwvg.ch"
+#include "wvgparts.ch"
+#include "wvtwin.ch"
diff --git a/contrib/gtwvg/gtwvg.hbc b/contrib/gtwvg/gtwvg.hbc
@@ -4,8 +4,6 @@ skip={!win}
 
 incpaths=.
 
-headers=hbgtwvg.ch wvgparts.ch wvtwin.ch
-
 gt=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 
 libs=hbwin.hbc

diff --git a/contrib/gtwvg/htmlview.prg b/contrib/gtwvg/htmlview.prg
@@ -53,9 +53,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 #define evBeforeNavigate                          100
 #define evNavigateComplete                        101

diff --git a/contrib/gtwvg/listbox.prg b/contrib/gtwvg/listbox.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgListBox INHERIT WvgWindow, WvgDataRef
 

diff --git a/contrib/gtwvg/menubar.prg b/contrib/gtwvg/menubar.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgMenuBar INHERIT wvgWindow
 

diff --git a/contrib/gtwvg/mle.prg b/contrib/gtwvg/mle.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgMLE INHERIT WvgWindow, WvgDataRef
 

diff --git a/contrib/gtwvg/paint.prg b/contrib/gtwvg/paint.prg
@@ -44,8 +44,7 @@
  *
  */
 
-#include "wvtwin.ch"
-
+#include "gtwvg.ch"
 #include "hbgtinfo.ch"
 
 THREAD STATIC t_paint_ := { { "", {} } }

diff --git a/contrib/gtwvg/parthdlr.prg b/contrib/gtwvg/parthdlr.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgPartHandler
 

diff --git a/contrib/gtwvg/pushbut.prg b/contrib/gtwvg/pushbut.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgPushButton INHERIT WvgWindow
 

diff --git a/contrib/gtwvg/radiobut.prg b/contrib/gtwvg/radiobut.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgRadioButton INHERIT WvgWindow, WvgDataRef
 

diff --git a/contrib/gtwvg/scrollbr.prg b/contrib/gtwvg/scrollbr.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgScrollBar INHERIT WvgWindow, WvgDataRef
 

diff --git a/contrib/gtwvg/sle.prg b/contrib/gtwvg/sle.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgSLE INHERIT WvgWindow, WvgDataRef
 

diff --git a/contrib/gtwvg/statbar.prg b/contrib/gtwvg/statbar.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgStatusBar INHERIT WvgWindow /* WvgActiveXControl */
 

diff --git a/contrib/gtwvg/static.prg b/contrib/gtwvg/static.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgStatic INHERIT WvgWindow
 

diff --git a/contrib/gtwvg/syswnd.prg b/contrib/gtwvg/syswnd.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgSysWindow INHERIT WvgPartHandler
 

diff --git a/contrib/gtwvg/tabpage.prg b/contrib/gtwvg/tabpage.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgTabPage INHERIT WvgWindow
 

diff --git a/contrib/gtwvg/tests/_activex.prg b/contrib/gtwvg/tests/_activex.prg
@@ -4,6 +4,7 @@
 #include "setcurs.ch"
 #include "hbgtinfo.ch"
 #include "hbver.ch"
+#include "gtwvg.ch"
 
 // The function has to be called via hb_threadStart( {|| ExecuteActiveX( nActiveX ) } )
 

diff --git a/contrib/gtwvg/tests/_cuigdlg.prg b/contrib/gtwvg/tests/_cuigdlg.prg
@@ -4,6 +4,7 @@
 
 #include "inkey.ch"
 #include "hbgtinfo.ch"
+#include "gtwvg.ch"
 
 // Simplified Console with GUI Look
 

diff --git a/contrib/gtwvg/tests/_dyndlgs.prg b/contrib/gtwvg/tests/_dyndlgs.prg
@@ -2,6 +2,7 @@
 
 #include "inkey.ch"
 #include "hbgtinfo.ch"
+#include "gtwvg.ch"
 
 #define ID_BTN_OK                  1
 #define ID_MLE                     10

diff --git a/contrib/gtwvg/tests/_modal.prg b/contrib/gtwvg/tests/_modal.prg
@@ -3,6 +3,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 #include "setcurs.ch"
+#include "gtwvg.ch"
 
 #xuntranslate Alert( =>
 

diff --git a/contrib/gtwvg/tests/_tbrowse.prg b/contrib/gtwvg/tests/_tbrowse.prg
@@ -13,6 +13,7 @@
 #include "setcurs.ch"
 #include "hbgtinfo.ch"
 #include "hbver.ch"
+#include "gtwvg.ch"
 
 #define K_MOVING                1001
 

diff --git a/contrib/gtwvg/tests/_utils.prg b/contrib/gtwvg/tests/_utils.prg
@@ -2,6 +2,7 @@
 
 #include "inkey.ch"
 #include "hbgtinfo.ch"
+#include "gtwvg.ch"
 
 // WvtSetObjects() array structure
 #define WVT_OBJ_TYPE               1

diff --git a/contrib/gtwvg/tests/_wvtcls.prg b/contrib/gtwvg/tests/_wvtcls.prg
@@ -9,6 +9,7 @@
 
 #include "inkey.ch"
 #include "hbgtinfo.ch"
+#include "gtwvg.ch"
 
 PROCEDURE DialogWvgClassesOne( nMode )
 

diff --git a/contrib/gtwvg/tests/_xbp.prg b/contrib/gtwvg/tests/_xbp.prg
@@ -3,6 +3,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 #include "hbver.ch"
+#include "gtwvg.ch"
 
 #define MUSIC_WAITON          {800, 1600}
 

diff --git a/contrib/gtwvg/tests/demowvg.prg b/contrib/gtwvg/tests/demowvg.prg
@@ -21,7 +21,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 #include "hbver.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 REQUEST DBFCDX
 REQUEST DBFNTX

diff --git a/contrib/gtwvg/tests/demowvg1.prg b/contrib/gtwvg/tests/demowvg1.prg
@@ -7,6 +7,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 #include "hbver.ch"
+#include "gtwvg.ch"
 
 #define IMAGE_VOUCH                hb_DirBase() + "vouch1.bmp"
 #define IMAGE_BROWSE               hb_DirBase() + "v_browse.ico"

diff --git a/contrib/gtwvg/tests/demoxbp.prg b/contrib/gtwvg/tests/demoxbp.prg
@@ -10,6 +10,7 @@
 
 #include "inkey.ch"
 #include "hbgtinfo.ch"
+#include "gtwvg.ch"
 
 PROCEDURE Main()
 

diff --git a/contrib/gtwvg/toolbar.prg b/contrib/gtwvg/toolbar.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgToolBar INHERIT WvgWindow /*WvgActiveXControl*/
 

diff --git a/contrib/gtwvg/treeview.prg b/contrib/gtwvg/treeview.prg
@@ -52,9 +52,7 @@
 #include "inkey.ch"
 #include "hbgtinfo.ch"
 
-#include "hbgtwvg.ch"
-#include "wvtwin.ch"
-#include "wvgparts.ch"
+#include "gtwvg.ch"
 
 CREATE CLASS WvgTreeView INHERIT WvgWindow, WvgDataRef