From 7de1beb9ef1845a7860af816fa6c1067b3fcfec7 Mon Sep 17 00:00:00 2001 From: "jmcquintas@gmail.com" Date: Thu, 23 Mar 2023 22:27:48 -0300 Subject: [PATCH] gtwvg.hbc do not force ch, create gtwvg.hbc to include 3 ch, changed on PRGs --- contrib/gtwvg/3state.prg | 4 +--- contrib/gtwvg/activex.prg | 4 +--- contrib/gtwvg/bitmap.prg | 4 +--- contrib/gtwvg/checkbox.prg | 4 +--- contrib/gtwvg/class.prg | 2 +- contrib/gtwvg/combobox.prg | 4 +--- contrib/gtwvg/crt.prg | 4 +--- contrib/gtwvg/dataref.prg | 4 +--- contrib/gtwvg/dialog.prg | 4 +--- contrib/gtwvg/drawarea.prg | 4 +--- contrib/gtwvg/genrc.prg | 4 +--- contrib/gtwvg/gtwvg.ch | 3 +++ contrib/gtwvg/gtwvg.hbc | 2 -- contrib/gtwvg/htmlview.prg | 4 +--- contrib/gtwvg/listbox.prg | 4 +--- contrib/gtwvg/menubar.prg | 4 +--- contrib/gtwvg/mle.prg | 4 +--- contrib/gtwvg/paint.prg | 3 +-- contrib/gtwvg/parthdlr.prg | 4 +--- contrib/gtwvg/pushbut.prg | 4 +--- contrib/gtwvg/radiobut.prg | 4 +--- contrib/gtwvg/scrollbr.prg | 4 +--- contrib/gtwvg/sle.prg | 4 +--- contrib/gtwvg/statbar.prg | 4 +--- contrib/gtwvg/static.prg | 4 +--- contrib/gtwvg/syswnd.prg | 4 +--- contrib/gtwvg/tabpage.prg | 4 +--- contrib/gtwvg/tests/_activex.prg | 1 + contrib/gtwvg/tests/_cuigdlg.prg | 1 + contrib/gtwvg/tests/_dyndlgs.prg | 1 + contrib/gtwvg/tests/_modal.prg | 1 + contrib/gtwvg/tests/_tbrowse.prg | 1 + contrib/gtwvg/tests/_utils.prg | 1 + contrib/gtwvg/tests/_wvtcls.prg | 1 + contrib/gtwvg/tests/_xbp.prg | 1 + contrib/gtwvg/tests/demowvg.prg | 2 +- contrib/gtwvg/tests/demowvg1.prg | 1 + contrib/gtwvg/tests/demoxbp.prg | 1 + contrib/gtwvg/toolbar.prg | 4 +--- contrib/gtwvg/treeview.prg | 4 +--- contrib/gtwvg/wnd.prg | 4 +--- 41 files changed, 42 insertions(+), 84 deletions(-) create mode 100644 contrib/gtwvg/gtwvg.ch diff --git a/contrib/gtwvg/3state.prg b/contrib/gtwvg/3state.prg index 74cb092aef..c03558afd8 100644 --- 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( [] ) => diff --git a/contrib/gtwvg/activex.prg b/contrib/gtwvg/activex.prg index aeefbb44fe..0ccf9bf095 100644 --- 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( [] ) => diff --git a/contrib/gtwvg/bitmap.prg b/contrib/gtwvg/bitmap.prg index f2accdce74..4188df3d29 100644 --- 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 index d7667ded56..368ed931d7 100644 --- 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 index c348ad1500..231d160109 100644 --- 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 index 585f5ec948..59a68516d6 100644 --- 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 index 23543dc927..3877c970d2 100644 --- 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 index 26310b2ac4..dd5a83a84e 100644 --- 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 index 96ed224e93..0e74913a8b 100644 --- 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 index 348186f40e..e27eb2a984 100644 --- 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 index 1dc45178e7..f86dee1ca9 100644 --- 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 new file mode 100644 index 0000000000..fc89e539ae --- /dev/null +++ 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 index 62f63c5fc8..b0e79bd804 100644 --- 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 index a04d7e51a6..4f088b235c 100644 --- 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 index 5e2a5edbf5..4842a800d5 100644 --- 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 index 97f39b0923..d5ee136586 100644 --- 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 index 702a287887..79d4f8b412 100644 --- 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 index cdf59a9e0c..8d1accaad4 100644 --- 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 index 5af7a7ebb2..0e2362fc20 100644 --- 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 index f582d883b6..efcc296a65 100644 --- 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 index b7638ccd22..f9baeab585 100644 --- 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 index 2d7b22dfb1..36164ae249 100644 --- 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 index 07cac4fe7c..5700d002fb 100644 --- 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 index dccefa3c53..623703db7a 100644 --- 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 index 2243cf6e66..bbfdbb904d 100644 --- 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 index 1343579153..99bf4624a6 100644 --- 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 index 769ef8a61e..fdd7ab0bea 100644 --- 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 index 257e0a9d0e..7bb1f36e7c 100644 --- 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 index 75a69883dd..a128ad12c5 100644 --- 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 index b5d44f9250..6ff027301c 100644 --- 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 index fcbb56d330..317fb92839 100644 --- 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 index a3579f935a..78b1e1b183 100644 --- 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 index 5d44338a8c..f1354c552a 100644 --- 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 index b5b48cf274..73c2c95f85 100644 --- 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 index a1d2d392b9..d3981e4330 100644 --- 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 index 70f36e2bb4..5adfde495c 100644 --- 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 index edf2011dec..05e49d4c9c 100644 --- 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 index b6b9d3c641..f7303e8000 100644 --- 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 index 7770070dd8..6b6c548eee 100644 --- 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 index f88dd80928..70d03b51d5 100644 --- 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 diff --git a/contrib/gtwvg/wnd.prg b/contrib/gtwvg/wnd.prg index c6bad2386b..b98cc46b09 100644 --- a/contrib/gtwvg/wnd.prg +++ b/contrib/gtwvg/wnd.prg @@ -52,9 +52,7 @@ #include "inkey.ch" #include "hbgtinfo.ch" -#include "hbgtwvg.ch" -#include "wvtwin.ch" -#include "wvgparts.ch" +#include "gtwvg.ch" /* To Switch Over from ASCALLBACK() to SET/GET_Prop() calls */ #if 0