2012-11-07 16:21 UTC+0100 Viktor Szakats (harbour syenar.net)

* extras/gtwvw/tests/wvt2wvw.ch * formatting + extras/gtwvw/gtwvw.hbx * extras/gtwvw/gtwvw.hbp + added .hbx file + extras/hbvpdf/hbvpdf.hbx * extras/hbvpdf/hbvpdf.hbp * extras/hbvpdf/hbvpdf.prg * extras/hbvpdf/hbvpsup.prg + added .hbx file * renamed internal function + extras/hbxlsxml/hbxlsxml.hbx * extras/hbxlsxml/hbxlsxml.hbp * extras/hbxlsxml/xlsxml_s.prg * extras/hbxlsxml/xlsxml_y.prg * extras/hbxlsxml/xlsxml.prg + added formatted .hbx file % some internal functions made STATIC * one function name translated to English
2012-11-07 15:24:01 +00:00
parent 9c2376e7f1
commit 53e02fb22e
13 changed files with 623 additions and 148 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,30 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2012-11-07 16:21 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * extras/gtwvw/tests/wvt2wvw.ch
+    * formatting
+
+  + extras/gtwvw/gtwvw.hbx
+  * extras/gtwvw/gtwvw.hbp
+    + added .hbx file
+
+  + extras/hbvpdf/hbvpdf.hbx
+  * extras/hbvpdf/hbvpdf.hbp
+  * extras/hbvpdf/hbvpdf.prg
+  * extras/hbvpdf/hbvpsup.prg
+    + added .hbx file
+    * renamed internal function
+
+  + extras/hbxlsxml/hbxlsxml.hbx
+  * extras/hbxlsxml/hbxlsxml.hbp
+  * extras/hbxlsxml/xlsxml_s.prg
+  * extras/hbxlsxml/xlsxml_y.prg
+  * extras/hbxlsxml/xlsxml.prg
+    + added formatted .hbx file
+    % some internal functions made STATIC
+    * one function name translated to English
+
 2012-11-07 15:55 UTC+0100 Viktor Szakats (harbour syenar.net)
  * contrib/hbzebra/qrcode.c
    * pacify an msvc 2010 warning (possibly a C compiler issue)
--- a/harbour/extras/gtwvw/gtwvw.hbp
+++ b/harbour/extras/gtwvw/gtwvw.hbp
@@ -13,6 +13,10 @@

 "-stop={!allwin}Skipped: '${hb_name}' only supported on win platform."

+-hbx=gtwvw.hbx
+
+gtwvw.hbx
+
 gtwvw.c
 wvwcheck.c
 wvwdraw.c
--- a/harbour/extras/gtwvw/gtwvw.hbx
+++ b/harbour/extras/gtwvw/gtwvw.hbx
@@ -0,0 +1,324 @@
+/*
+ * $Id$
+ */
+
+/* --------------------------------------------------------------------
+ * NOTE: You can add manual override which functions to include or
+ *       exclude from automatically generated EXTERNAL/DYNAMIC list.
+ *          Syntax: // HB_FUNC_INCLUDE <func>
+ *                  // HB_FUNC_EXCLUDE <func>
+ */
+
+/* --------------------------------------------------------------------
+ * WARNING: Automatically generated code below. DO NOT EDIT!
+ *          Regenerate using hbmk2 '-hbx=' option.
+ */
+
+#ifndef __HBEXTERN_CH__GTWVW__
+#define __HBEXTERN_CH__GTWVW__
+
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__GTWVW__ANNOUNCE )
+   ANNOUNCE __HBEXTERN__GTWVW__
+#endif
+
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__GTWVW__REQUEST )
+   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
+#endif
+
+DYNAMIC ADDTOOLTIPEX
+DYNAMIC BRINGTOTOP1
+DYNAMIC CREATEFONT
+DYNAMIC CREATEHATCHBRUSH
+DYNAMIC CREATEIMAGELIST
+DYNAMIC CREATESOLIDBRUSH
+DYNAMIC DRAWBITMAP
+DYNAMIC DRAWICON
+DYNAMIC GETBITMAPSIZE
+DYNAMIC GETICONSIZE
+DYNAMIC GETSYSCOLOR
+DYNAMIC HB_GT_WVW
+DYNAMIC IMAGELIST_ADD
+DYNAMIC IMAGELIST_ADDMASKED
+DYNAMIC INVALIDATERECT
+DYNAMIC ISWINDOW
+DYNAMIC LOADBITMAP
+DYNAMIC LOADBITMAPEX
+DYNAMIC LOADICON
+DYNAMIC LOADIMAGE
+DYNAMIC OPENBITMAP
+DYNAMIC OPENIMAGE
+DYNAMIC REDRAWWINDOW
+DYNAMIC RGB
+DYNAMIC SELECTFONT
+DYNAMIC SENDMESSAGE
+DYNAMIC SETBITMAPRESOURCEID
+DYNAMIC SETBKCOLOR
+DYNAMIC SETPARENT
+DYNAMIC SETTEXTCOLOR
+DYNAMIC TOOLBARADDBUTTONS
+DYNAMIC WINDOW2BITMAP
+DYNAMIC WIN_CHECKDLGBUTTON
+DYNAMIC WIN_CHECKRADIOBUTTON
+DYNAMIC WIN_CREATEBRUSH
+DYNAMIC WIN_DELETEOBJECT
+DYNAMIC WIN_DRAWTEXT
+DYNAMIC WIN_GETCLIENTRECT
+DYNAMIC WIN_GETDC
+DYNAMIC WIN_GETDIALOGBASEUNITS
+DYNAMIC WIN_GETDLGITEM
+DYNAMIC WIN_GETDLGITEMTEXT
+DYNAMIC WIN_GETSTOCKOBJECT
+DYNAMIC WIN_INVALIDATERECT
+DYNAMIC WIN_ISDLGBUTTONCHECKED
+DYNAMIC WIN_LOADICON
+DYNAMIC WIN_LOADIMAGE
+DYNAMIC WIN_MESSAGEBOX
+DYNAMIC WIN_MULDIV
+DYNAMIC WIN_RELEASEDC
+DYNAMIC WIN_SELECTOBJECT
+DYNAMIC WIN_SENDDLGITEMMESSAGE
+DYNAMIC WIN_SENDMESSAGE
+DYNAMIC WIN_SETBKCOLOR
+DYNAMIC WIN_SETDLGITEMTEXT
+DYNAMIC WIN_SETFOCUS
+DYNAMIC WIN_SETMENU
+DYNAMIC WIN_SETTEXTCOLOR
+DYNAMIC WIN_SETTIMER
+DYNAMIC WVW_ADDROWS
+DYNAMIC WVW_ALLOWNONTOPEVENT
+DYNAMIC WVW_APPENDMENU
+DYNAMIC WVW_CBADDSTRING
+DYNAMIC WVW_CBCREATE
+DYNAMIC WVW_CBDESTROY
+DYNAMIC WVW_CBENABLE
+DYNAMIC WVW_CBFINDSTRING
+DYNAMIC WVW_CBGETCURTEXT
+DYNAMIC WVW_CBGETINDEX
+DYNAMIC WVW_CBISDROPPED
+DYNAMIC WVW_CBISFOCUSED
+DYNAMIC WVW_CBSETCODEBLOCK
+DYNAMIC WVW_CBSETCURSEL
+DYNAMIC WVW_CBSETFOCUS
+DYNAMIC WVW_CBSETFONT
+DYNAMIC WVW_CBSETINDEX
+DYNAMIC WVW_CBVISIBLE
+DYNAMIC WVW_CENTERWINDOW
+DYNAMIC WVW_CHOOSECOLOR
+DYNAMIC WVW_CHOOSEFONT
+DYNAMIC WVW_CLIENTTOSCREEN
+DYNAMIC WVW_CREATEDIALOGDYNAMIC
+DYNAMIC WVW_CREATEDIALOGMODAL
+DYNAMIC WVW_CREATEFONT
+DYNAMIC WVW_CREATEMENU
+DYNAMIC WVW_CREATEPOPUPMENU
+DYNAMIC WVW_CXCREATE
+DYNAMIC WVW_CXDESTROY
+DYNAMIC WVW_CXENABLE
+DYNAMIC WVW_CXGETCHECK
+DYNAMIC WVW_CXSETCHECK
+DYNAMIC WVW_CXSETCODEBLOCK
+DYNAMIC WVW_CXSETFOCUS
+DYNAMIC WVW_CXSETFONT
+DYNAMIC WVW_CXSTATUSFONT
+DYNAMIC WVW_CXVISIBLE
+DYNAMIC WVW_DELETEMENU
+DYNAMIC WVW_DELETEOBJECT
+DYNAMIC WVW_DESTROYMENU
+DYNAMIC WVW_DLGSETICON
+DYNAMIC WVW_DRAWBOXGET
+DYNAMIC WVW_DRAWBOXGET_XP
+DYNAMIC WVW_DRAWBOXGROUP
+DYNAMIC WVW_DRAWBOXGROUPRAISED
+DYNAMIC WVW_DRAWBOXRAISED
+DYNAMIC WVW_DRAWBOXRECESSED
+DYNAMIC WVW_DRAWBUTTON
+DYNAMIC WVW_DRAWCOLORRECT
+DYNAMIC WVW_DRAWELLIPSE
+DYNAMIC WVW_DRAWFOCUSRECT
+DYNAMIC WVW_DRAWGRIDHORZ
+DYNAMIC WVW_DRAWGRIDVERT
+DYNAMIC WVW_DRAWIMAGE
+DYNAMIC WVW_DRAWIMAGE_RESOURCE
+DYNAMIC WVW_DRAWLABEL
+DYNAMIC WVW_DRAWLABELEX
+DYNAMIC WVW_DRAWLABELOBJ
+DYNAMIC WVW_DRAWLINE
+DYNAMIC WVW_DRAWLINEEX
+DYNAMIC WVW_DRAWMENUBAR
+DYNAMIC WVW_DRAWOUTLINE
+DYNAMIC WVW_DRAWOUTLINEEX
+DYNAMIC WVW_DRAWPICTURE
+DYNAMIC WVW_DRAWPROGRESSBAR
+DYNAMIC WVW_DRAWRECTANGLE
+DYNAMIC WVW_DRAWROUNDRECT
+DYNAMIC WVW_DRAWSCROLLBUTTON
+DYNAMIC WVW_DRAWSCROLLTHUMBHORZ
+DYNAMIC WVW_DRAWSCROLLTHUMBVERT
+DYNAMIC WVW_DRAWSHADEDRECT
+DYNAMIC WVW_DRAWSTATUSBAR
+DYNAMIC WVW_DRAWTEXTBOX
+DYNAMIC WVW_DRAWTOOLBUTTONSTATE
+DYNAMIC WVW_EBCREATE
+DYNAMIC WVW_EBDESTROY
+DYNAMIC WVW_EBEDITABLE
+DYNAMIC WVW_EBENABLE
+DYNAMIC WVW_EBGETSEL
+DYNAMIC WVW_EBGETTEXT
+DYNAMIC WVW_EBISFOCUSED
+DYNAMIC WVW_EBISMULTILINE
+DYNAMIC WVW_EBSETCODEBLOCK
+DYNAMIC WVW_EBSETFOCUS
+DYNAMIC WVW_EBSETFONT
+DYNAMIC WVW_EBSETSEL
+DYNAMIC WVW_EBSETTEXT
+DYNAMIC WVW_ENABLEMAXIMIZE
+DYNAMIC WVW_ENABLEMENUITEM
+DYNAMIC WVW_ENABLESHORTCUTS
+DYNAMIC WVW_ENDMENU
+DYNAMIC WVW_FILLRECTANGLE
+DYNAMIC WVW_GBCREATE
+DYNAMIC WVW_GETCLIPBOARD
+DYNAMIC WVW_GETCURSORPOS
+DYNAMIC WVW_GETFONTINFO
+DYNAMIC WVW_GETKEYSTATE
+DYNAMIC WVW_GETLASTMENUEVENT
+DYNAMIC WVW_GETMENU
+DYNAMIC WVW_GETPAINTRECT
+DYNAMIC WVW_GETPALETTE
+DYNAMIC WVW_GETRGBCOLOR
+DYNAMIC WVW_GETROWCOLFROMXY
+DYNAMIC WVW_GETSCREENHEIGHT
+DYNAMIC WVW_GETSCREENWIDTH
+DYNAMIC WVW_GETSYSTEMMENU
+DYNAMIC WVW_GETTITLE
+DYNAMIC WVW_GETWINDOWHANDLE
+DYNAMIC WVW_GETXYFROMROWCOL
+DYNAMIC WVW_GET_HND_WINDOW
+DYNAMIC WVW_HIWORD
+DYNAMIC WVW_INVALIDATERECT
+DYNAMIC WVW_ISLBUTTONPRESSED
+DYNAMIC WVW_KEYBOARD
+DYNAMIC WVW_KILLTIMER
+DYNAMIC WVW_LBADDSTRING
+DYNAMIC WVW_LBSETCURSEL
+DYNAMIC WVW_LCLOSEWINDOW
+DYNAMIC WVW_LOADFONT
+DYNAMIC WVW_LOADPEN
+DYNAMIC WVW_LOADPICTURE
+DYNAMIC WVW_LOWORD
+DYNAMIC WVW_MAXIMIZE
+DYNAMIC WVW_MAXMAXCOL
+DYNAMIC WVW_MAXMAXROW
+DYNAMIC WVW_MENUITEM_SETBITMAPS
+DYNAMIC WVW_MESSAGEBOX
+DYNAMIC WVW_MINIMIZE
+DYNAMIC WVW_MOUSE_COL
+DYNAMIC WVW_MOUSE_ROW
+DYNAMIC WVW_MOVE_READY
+DYNAMIC WVW_NCOLOFS
+DYNAMIC WVW_NNUMWINDOWS
+DYNAMIC WVW_NOCLOSE
+DYNAMIC WVW_NOPENWINDOW
+DYNAMIC WVW_NOSTARTUPSUBWINDOW
+DYNAMIC WVW_NOSYSMENU
+DYNAMIC WVW_NROWOFS
+DYNAMIC WVW_NSETCURWINDOW
+DYNAMIC WVW_NUMBMCACHE
+DYNAMIC WVW_PASTEFROMCLIPBOARD
+DYNAMIC WVW_PBCREATE
+DYNAMIC WVW_PBDESTROY
+DYNAMIC WVW_PBENABLE
+DYNAMIC WVW_PBISFOCUSED
+DYNAMIC WVW_PBSETCODEBLOCK
+DYNAMIC WVW_PBSETFOCUS
+DYNAMIC WVW_PBSETFONT
+DYNAMIC WVW_PBSETSTYLE
+DYNAMIC WVW_PBVISIBLE
+DYNAMIC WVW_PGCREATE
+DYNAMIC WVW_PGDESTROY
+DYNAMIC WVW_PGGETPOS
+DYNAMIC WVW_PGSETPOS
+DYNAMIC WVW_PGSETRANGE
+DYNAMIC WVW_PROCESSMESSAGES
+DYNAMIC WVW_RBCREATE
+DYNAMIC WVW_RECTANGLE
+DYNAMIC WVW_RECURSECBLOCK
+DYNAMIC WVW_RESTORE
+DYNAMIC WVW_RESTSCREEN
+DYNAMIC WVW_SAVESCREEN
+DYNAMIC WVW_SBADDPART
+DYNAMIC WVW_SBCREATE
+DYNAMIC WVW_SBDESTROY
+DYNAMIC WVW_SBGETPARTS
+DYNAMIC WVW_SBGETTEXT
+DYNAMIC WVW_SBREFRESH
+DYNAMIC WVW_SBSETFONT
+DYNAMIC WVW_SBSETTEXT
+DYNAMIC WVW_SETALTF4CLOSE
+DYNAMIC WVW_SETASNORMAL
+DYNAMIC WVW_SETBKMODE
+DYNAMIC WVW_SETBRUSH
+DYNAMIC WVW_SETCLIPBOARD
+DYNAMIC WVW_SETCODEPAGE
+DYNAMIC WVW_SETCONTROLTEXT
+DYNAMIC WVW_SETDEFCENTREWINDOW
+DYNAMIC WVW_SETDEFHCENTREWINDOW
+DYNAMIC WVW_SETDEFLINESPACING
+DYNAMIC WVW_SETDEFLSPACECOLOR
+DYNAMIC WVW_SETDEFVCENTREWINDOW
+DYNAMIC WVW_SETFONT
+DYNAMIC WVW_SETICON
+DYNAMIC WVW_SETLASTMENUEVENT
+DYNAMIC WVW_SETLINESPACING
+DYNAMIC WVW_SETLSPACECOLOR
+DYNAMIC WVW_SETMAINCOORD
+DYNAMIC WVW_SETMAXBMCACHE
+DYNAMIC WVW_SETMENU
+DYNAMIC WVW_SETMENUKEYEVENT
+DYNAMIC WVW_SETMOUSEMOVE
+DYNAMIC WVW_SETMOUSEPOS
+DYNAMIC WVW_SETONTOP
+DYNAMIC WVW_SETPAINTREFRESH
+DYNAMIC WVW_SETPALETTE
+DYNAMIC WVW_SETPEN
+DYNAMIC WVW_SETPOINTER
+DYNAMIC WVW_SETPOPUPMENU
+DYNAMIC WVW_SETTIMER
+DYNAMIC WVW_SETTITLE
+DYNAMIC WVW_SETVERTCARET
+DYNAMIC WVW_SETWINDOWCENTRE
+DYNAMIC WVW_SETWINDOWPOS
+DYNAMIC WVW_SETWINSTYLE
+DYNAMIC WVW_SHOWWINDOW
+DYNAMIC WVW_SIZE_READY
+DYNAMIC WVW_STCREATE
+DYNAMIC WVW_STSETFONT
+DYNAMIC WVW_STSETTEXT
+DYNAMIC WVW_TBADDBUTTON
+DYNAMIC WVW_TBBUTTONCOUNT
+DYNAMIC WVW_TBCMD2INDEX
+DYNAMIC WVW_TBCREATE
+DYNAMIC WVW_TBDELBUTTON
+DYNAMIC WVW_TBDESTROY
+DYNAMIC WVW_TBENABLEBUTTON
+DYNAMIC WVW_TBGETBUTTONRECT
+DYNAMIC WVW_TBINDEX2CMD
+DYNAMIC WVW_TRACKPOPUPMENU
+DYNAMIC WVW_UNREACHEDBR
+DYNAMIC WVW_UPDATEWINDOW
+DYNAMIC WVW_XBCREATE
+DYNAMIC WVW_XBDESTROY
+DYNAMIC WVW_XBENABLE
+DYNAMIC WVW_XBINFO
+DYNAMIC WVW_XBSHOW
+DYNAMIC WVW_XBUPDATE
+DYNAMIC WVW_XBVISIBLE
+DYNAMIC WVW_XREPOSWINDOW
+DYNAMIC WVW_YESCLOSE
+DYNAMIC WVW__MAKEDLGTEMPLATE
+
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__GTWVW__REQUEST )
+   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
+#endif
+
+#endif
--- a/harbour/extras/gtwvw/tests/wvt2wvw.ch
+++ b/harbour/extras/gtwvw/tests/wvt2wvw.ch
@@ -19,48 +19,48 @@ PART-1: WINDOW INDEPENDENT (the same parameter list)
 *********************************************************************/
 /********************************************************************/

-#xtranslate WVT_CREATEMENU         ([<vlist,...>])  => WVW_CREATEMENU         ([<vlist>])
-#xtranslate WVT_CREATEPOPUPMENU    ([<vlist,...>])  => WVW_CREATEPOPUPMENU    ([<vlist>])
-#xtranslate WVT_APPENDMENU         ([<vlist,...>])  => WVW_APPENDMENU         ([<vlist>])
-#xtranslate WVT_DELETEMENU         ([<vlist,...>])  => WVW_DELETEMENU         ([<vlist>])
-#xtranslate WVT_DESTROYMENU        ([<vlist,...>])  => WVW_DESTROYMENU        ([<vlist>])
-#xtranslate WVT_ENABLEMENUITEM     ([<vlist,...>])  => WVW_ENABLEMENUITEM     ([<vlist>])
-#xtranslate WVT_GETSCREENWIDTH     ([<vlist,...>])  => WVW_GETSCREENWIDTH     ([<vlist>])
-#xtranslate WVT_GETSCREENHEIGHT    ([<vlist,...>])  => WVW_GETSCREENHEIGHT    ([<vlist>])
-#xtranslate WVT_SETALTF4CLOSE      ([<vlist,...>])  => WVW_SETALTF4CLOSE      ([<vlist>])
-#xtranslate WVT_GETRGBCOLOR        ([<vlist,...>])  => WVW_GETRGBCOLOR        ([<vlist>])
-#xtranslate WVT_GETCLIPBOARD       ([<vlist,...>])  => WVW_GETCLIPBOARD       ([<vlist>])
-#xtranslate WVT_SETCLIPBOARD       ([<vlist,...>])  => WVW_SETCLIPBOARD       ([<vlist>])
-#xtranslate WVT_PASTEFROMCLIPBOARD ([<vlist,...>])  => WVW_PASTEFROMCLIPBOARD ([<vlist>])
-#xtranslate WVT_KEYBOARD           ([<vlist,...>])  => WVW_KEYBOARD           ([<vlist>])
-#xtranslate WVT_ISLBUTTONPRESSED   ([<vlist,...>])  => WVW_ISLBUTTONPRESSED   ([<vlist>])
-#xtranslate WVT_GETPALETTE         ([<vlist,...>])  => WVW_GETPALETTE         ([<vlist>])
-#xtranslate WVT_SETPALETTE         ([<vlist,...>])  => WVW_SETPALETTE         ([<vlist>])
-#xtranslate WVT_CREATEFONT         ([<vlist,...>])  => WVW_CREATEFONT         ([<vlist>])
-#xtranslate WVT_GETCURSORPOS       ([<vlist,...>])  => WVW_GETCURSORPOS       ([<vlist>])
-#xtranslate WVT_CHOOSEFONT         ([<vlist,...>])  => WVW_CHOOSEFONT         ([<vlist>])
-#xtranslate WVT_CHOOSECOLOR        ([<vlist,...>])  => WVW_CHOOSECOLOR        ([<vlist>])
-#xtranslate WVT_LOADPICTURE        ([<vlist,...>])  => WVW_LOADPICTURE        ([<vlist>])
-#xtranslate WVT_LOADFONT           ([<vlist,...>])  => WVW_LOADFONT           ([<vlist>])
-#xtranslate WVT_LOADPEN            ([<vlist,...>])  => WVW_LOADPEN            ([<vlist>])
-#xtranslate WVT_SETPEN             ([<vlist,...>])  => WVW_SETPEN             ([<vlist>])
-#xtranslate WVT_SETBRUSH           ([<vlist,...>])  => WVW_SETBRUSH           ([<vlist>])
+#xtranslate WVT_CREATEMENU         ( [<vlist,...>] )  => WVW_CREATEMENU         ( [<vlist>] )
+#xtranslate WVT_CREATEPOPUPMENU    ( [<vlist,...>] )  => WVW_CREATEPOPUPMENU    ( [<vlist>] )
+#xtranslate WVT_APPENDMENU         ( [<vlist,...>] )  => WVW_APPENDMENU         ( [<vlist>] )
+#xtranslate WVT_DELETEMENU         ( [<vlist,...>] )  => WVW_DELETEMENU         ( [<vlist>] )
+#xtranslate WVT_DESTROYMENU        ( [<vlist,...>] )  => WVW_DESTROYMENU        ( [<vlist>] )
+#xtranslate WVT_ENABLEMENUITEM     ( [<vlist,...>] )  => WVW_ENABLEMENUITEM     ( [<vlist>] )
+#xtranslate WVT_GETSCREENWIDTH     ( [<vlist,...>] )  => WVW_GETSCREENWIDTH     ( [<vlist>] )
+#xtranslate WVT_GETSCREENHEIGHT    ( [<vlist,...>] )  => WVW_GETSCREENHEIGHT    ( [<vlist>] )
+#xtranslate WVT_SETALTF4CLOSE      ( [<vlist,...>] )  => WVW_SETALTF4CLOSE      ( [<vlist>] )
+#xtranslate WVT_GETRGBCOLOR        ( [<vlist,...>] )  => WVW_GETRGBCOLOR        ( [<vlist>] )
+#xtranslate WVT_GETCLIPBOARD       ( [<vlist,...>] )  => WVW_GETCLIPBOARD       ( [<vlist>] )
+#xtranslate WVT_SETCLIPBOARD       ( [<vlist,...>] )  => WVW_SETCLIPBOARD       ( [<vlist>] )
+#xtranslate WVT_PASTEFROMCLIPBOARD ( [<vlist,...>] )  => WVW_PASTEFROMCLIPBOARD ( [<vlist>] )
+#xtranslate WVT_KEYBOARD           ( [<vlist,...>] )  => WVW_KEYBOARD           ( [<vlist>] )
+#xtranslate WVT_ISLBUTTONPRESSED   ( [<vlist,...>] )  => WVW_ISLBUTTONPRESSED   ( [<vlist>] )
+#xtranslate WVT_GETPALETTE         ( [<vlist,...>] )  => WVW_GETPALETTE         ( [<vlist>] )
+#xtranslate WVT_SETPALETTE         ( [<vlist,...>] )  => WVW_SETPALETTE         ( [<vlist>] )
+#xtranslate WVT_CREATEFONT         ( [<vlist,...>] )  => WVW_CREATEFONT         ( [<vlist>] )
+#xtranslate WVT_GETCURSORPOS       ( [<vlist,...>] )  => WVW_GETCURSORPOS       ( [<vlist>] )
+#xtranslate WVT_CHOOSEFONT         ( [<vlist,...>] )  => WVW_CHOOSEFONT         ( [<vlist>] )
+#xtranslate WVT_CHOOSECOLOR        ( [<vlist,...>] )  => WVW_CHOOSECOLOR        ( [<vlist>] )
+#xtranslate WVT_LOADPICTURE        ( [<vlist,...>] )  => WVW_LOADPICTURE        ( [<vlist>] )
+#xtranslate WVT_LOADFONT           ( [<vlist,...>] )  => WVW_LOADFONT           ( [<vlist>] )
+#xtranslate WVT_LOADPEN            ( [<vlist,...>] )  => WVW_LOADPEN            ( [<vlist>] )
+#xtranslate WVT_SETPEN             ( [<vlist,...>] )  => WVW_SETPEN             ( [<vlist>] )
+#xtranslate WVT_SETBRUSH           ( [<vlist,...>] )  => WVW_SETBRUSH           ( [<vlist>] )

-#xtranslate WVT_CREATEDIALOGDYNAMIC([<vlist,...>])  => WVW_CREATEDIALOGDYNAMIC([<vlist>])
-#xtranslate WVT_CREATEDIALOGMODAL  ([<vlist,...>])  => WVW_CREATEDIALOGMODAL  ([<vlist>])
-#xtranslate WVT__MAKEDLGTEMPLATE   ([<vlist,...>])  => WVW__MAKEDLGTEMPLATE   ([<vlist>])
-#xtranslate WVT_LBADDSTRING        ([<vlist,...>])  => WVW_LBADDSTRING        ([<vlist>])
-#xtranslate WVT_LBSETCURSEL        ([<vlist,...>])  => WVW_LBSETCURSEL        ([<vlist>])
-#xtranslate WVT_CBADDSTRING        ([<vlist,...>])  => WVW_CBADDSTRING        ([<vlist>])
-#xtranslate WVT_CBSETCURSEL        ([<vlist,...>])  => WVW_CBSETCURSEL        ([<vlist>])
-#xtranslate WVT_DLGSETICON         ([<vlist,...>])  => WVW_DLGSETICON         ([<vlist>])
+#xtranslate WVT_CREATEDIALOGDYNAMIC( [<vlist,...>] )  => WVW_CREATEDIALOGDYNAMIC( [<vlist>] )
+#xtranslate WVT_CREATEDIALOGMODAL  ( [<vlist,...>] )  => WVW_CREATEDIALOGMODAL  ( [<vlist>] )
+#xtranslate WVT__MAKEDLGTEMPLATE   ( [<vlist,...>] )  => WVW__MAKEDLGTEMPLATE   ( [<vlist>] )
+#xtranslate WVT_LBADDSTRING        ( [<vlist,...>] )  => WVW_LBADDSTRING        ( [<vlist>] )
+#xtranslate WVT_LBSETCURSEL        ( [<vlist,...>] )  => WVW_LBSETCURSEL        ( [<vlist>] )
+#xtranslate WVT_CBADDSTRING        ( [<vlist,...>] )  => WVW_CBADDSTRING        ( [<vlist>] )
+#xtranslate WVT_CBSETCURSEL        ( [<vlist,...>] )  => WVW_CBSETCURSEL        ( [<vlist>] )
+#xtranslate WVT_DLGSETICON         ( [<vlist,...>] )  => WVW_DLGSETICON         ( [<vlist>] )


 /********************************************************************
 These functions do not exist in WVT.
 *********************************************************************/
-//WVT_SETVERTCARET       ([<vlist,...>])  => WVW_SETVERTCARET       ([<vlist>])
-//WVT_SETDEFLINESPACING  ([<vlist,...>])  => WVW_SETDEFLINESPACING  ([<vlist>])
+//WVT_SETVERTCARET       ( [<vlist,...>] )  => WVW_SETVERTCARET       ( [<vlist>] )
+//WVT_SETDEFLINESPACING  ( [<vlist,...>] )  => WVW_SETDEFLINESPACING  ( [<vlist>] )

 /********************************************************************/
 /********************************************************************
@@ -86,103 +86,103 @@ PART-2: WINDOW DEPENDENT (additional nWinNum parameter)

 */

-#xtranslate WVT_SETMENU             ([<vlist,...>])    =>  WVW_SETMENU             (NIL [, <vlist>])
-#xtranslate WVT_SETPOPUPMENU        ([<vlist,...>])    =>  WVW_SETPOPUPMENU        (NIL [, <vlist>])
-#xtranslate WVT_GETLASTMENUEVENT    ([<vlist,...>])    =>  WVW_GETLASTMENUEVENT    (NIL [, <vlist>])
-#xtranslate WVT_SETMENUKEYEVENT     ([<vlist,...>])    =>  WVW_SETMENUKEYEVENT     (NIL [, <vlist>])
-#xtranslate WVT_DRAWMENUBAR         ([<vlist,...>])    =>  WVW_DRAWMENUBAR         (NIL [, <vlist>])
-#xtranslate WVT_SETWINDOWCENTRE     ([<vlist,...>])    =>  WVW_SETWINDOWCENTRE     (NIL [, <vlist>])
-#xtranslate WVT_PROCESSMESSAGES     ([<vlist,...>])    =>  WVW_PROCESSMESSAGES     (NIL [, <vlist>])
-#xtranslate WVT_GETTITLE            ([<vlist,...>])    =>  WVW_GETTITLE            (NIL [, <vlist>])
-#xtranslate WVT_INVALIDATERECT      ([<vlist,...>])    =>  WVW_INVALIDATERECT      (NIL [, <vlist>])
-#xtranslate WVT_CLIENTTOSCREEN      ([<vlist,...>])    =>  WVW_CLIENTTOSCREEN      (NIL [, <vlist>])
-#xtranslate WVT_SETFONT             ([<vlist,...>])    =>  WVW_SETFONT             (NIL [, <vlist>])
-#xtranslate WVT_SETICON             ([<vlist,...>])    =>  WVW_SETICON             (NIL [, <vlist>])
-#xtranslate WVT_SETTITLE            ([<vlist,...>])    =>  WVW_SETTITLE            (NIL [, <vlist>])
-#xtranslate WVT_SETWINDOWPOS        ([<vlist,...>])    =>  WVW_SETWINDOWPOS        (NIL [, <vlist>])
-#xtranslate WVT_GETWINDOWHANDLE     ([<vlist,...>])    =>  WVW_GETWINDOWHANDLE     (NIL [, <vlist>])
-#xtranslate WVT_SETCODEPAGE         ([<vlist,...>])    =>  WVW_SETCODEPAGE         (NIL [, <vlist>])
-#xtranslate WVT_CENTERWINDOW        ([<vlist,...>])    =>  WVW_CENTERWINDOW        (NIL [, <vlist>])
-#xtranslate WVT_SETMOUSEMOVE        ([<vlist,...>])    =>  WVW_SETMOUSEMOVE        (NIL [, <vlist>])
-#xtranslate WVT_GETXYFROMROWCOL     ([<vlist,...>])    =>  WVW_GETXYFROMROWCOL     (NIL [, <vlist>])
-#xtranslate WVT_GETFONTINFO         ([<vlist,...>])    =>  WVW_GETFONTINFO         (NIL [, <vlist>])
-#xtranslate WVT_MINIMIZE            ([<vlist,...>])    =>  WVW_MINIMIZE            (NIL [, <vlist>])
-#xtranslate WVT_MAXIMIZE            ([<vlist,...>])    =>  WVW_MAXIMIZE            (NIL [, <vlist>])
-#xtranslate WVT_SETONTOP            ([<vlist,...>])    =>  WVW_SETONTOP            (NIL [, <vlist>])
-#xtranslate WVT_SETASNORMAL         ([<vlist,...>])    =>  WVW_SETASNORMAL         (NIL [, <vlist>])
-#xtranslate WVT_SAVESCREEN          ([<vlist,...>])    =>  WVW_SAVESCREEN          (NIL [, <vlist>])
-#xtranslate WVT_RESTSCREEN          ([<vlist,...>])    =>  WVW_RESTSCREEN          (NIL [, <vlist>])
-#xtranslate WVT_DRAWLABELOBJ        ([<vlist,...>])    =>  WVW_DRAWLABELOBJ        (NIL [, <vlist>])
-#xtranslate WVT_DRAWTOOLBUTTONSTATE ([<vlist,...>])    =>  WVW_DRAWTOOLBUTTONSTATE (NIL [, <vlist>])
-#xtranslate WVT_DRAWSCROLLBUTTON    ([<vlist,...>])    =>  WVW_DRAWSCROLLBUTTON    (NIL [, <vlist>])
-#xtranslate WVT_DRAWSCROLLTHUMBVERT ([<vlist,...>])    =>  WVW_DRAWSCROLLTHUMBVERT (NIL [, <vlist>])
-#xtranslate WVT_DRAWSCROLLTHUMBHORZ ([<vlist,...>])    =>  WVW_DRAWSCROLLTHUMBHORZ (NIL [, <vlist>])
-#xtranslate WVT_DRAWSHADEDRECT      ([<vlist,...>])    =>  WVW_DRAWSHADEDRECT      (NIL [, <vlist>])
-#xtranslate WVT_DRAWTEXTBOX         ([<vlist,...>])    =>  WVW_DRAWTEXTBOX         (NIL [, <vlist>])
-#xtranslate WVT_DRAWPROGRESSBAR     ([<vlist,...>])    =>  WVW_DRAWPROGRESSBAR     (NIL [, <vlist>])
-#xtranslate WVT_TRACKPOPUPMENU      ([<vlist,...>])    =>  WVW_TRACKPOPUPMENU      (NIL [, <vlist>])
-#xtranslate WVT_GETMENU             ([<vlist,...>])    =>  WVW_GETMENU             (NIL [, <vlist>])
-#xtranslate WVT_SHOWWINDOW          ([<vlist,...>])    =>  WVW_SHOWWINDOW          (NIL [, <vlist>])
-#xtranslate WVT_UPDATEWINDOW        ([<vlist,...>])    =>  WVW_UPDATEWINDOW        (NIL [, <vlist>])
-#xtranslate WVT_DRAWBOXGET          ([<vlist,...>])    =>  WVW_DRAWBOXGET          (NIL [, <vlist>])
-#xtranslate WVT_DRAWBOXRAISED       ([<vlist,...>])    =>  WVW_DRAWBOXRAISED       (NIL [, <vlist>])
-#xtranslate WVT_DRAWBOXRECESSED     ([<vlist,...>])    =>  WVW_DRAWBOXRECESSED     (NIL [, <vlist>])
-#xtranslate WVT_DRAWBOXGROUP        ([<vlist,...>])    =>  WVW_DRAWBOXGROUP        (NIL [, <vlist>])
-#xtranslate WVT_DRAWBOXGROUPRAISED  ([<vlist,...>])    =>  WVW_DRAWBOXGROUPRAISED  (NIL [, <vlist>])
-#xtranslate WVT_DRAWIMAGE           ([<vlist,...>])    =>  WVW_DRAWIMAGE           (NIL [, <vlist>])
-#xtranslate WVT_DRAWLABEL           ([<vlist,...>])    =>  WVW_DRAWLABEL           (NIL [, <vlist>])
-#xtranslate WVT_DRAWOUTLINE         ([<vlist,...>])    =>  WVW_DRAWOUTLINE         (NIL [, <vlist>])
-#xtranslate WVT_DRAWLINE            ([<vlist,...>])    =>  WVW_DRAWLINE            (NIL [, <vlist>])
-#xtranslate WVT_DRAWELLIPSE         ([<vlist,...>])    =>  WVW_DRAWELLIPSE         (NIL [, <vlist>])
-#xtranslate WVT_DRAWRECTANGLE       ([<vlist,...>])    =>  WVW_DRAWRECTANGLE       (NIL [, <vlist>])
-#xtranslate WVT_FILLRECTANGLE       ([<vlist,...>])    =>  WVW_FILLRECTANGLE       (NIL [, <vlist>])
-#xtranslate WVT_DRAWCOLORRECT       ([<vlist,...>])    =>  WVW_DRAWCOLORRECT       (NIL [, <vlist>])
-#xtranslate WVT_DRAWROUNDRECT       ([<vlist,...>])    =>  WVW_DRAWROUNDRECT       (NIL [, <vlist>])
-#xtranslate WVT_DRAWFOCUSRECT       ([<vlist,...>])    =>  WVW_DRAWFOCUSRECT       (NIL [, <vlist>])
-#xtranslate WVT_DRAWGRIDHORZ        ([<vlist,...>])    =>  WVW_DRAWGRIDHORZ        (NIL [, <vlist>])
-#xtranslate WVT_DRAWGRIDVERT        ([<vlist,...>])    =>  WVW_DRAWGRIDVERT        (NIL [, <vlist>])
-#xtranslate WVT_DRAWBUTTON          ([<vlist,...>])    =>  WVW_DRAWBUTTON          (NIL [, <vlist>])
+#xtranslate WVT_SETMENU             ( [<vlist,...>] )    =>  WVW_SETMENU             ( NIL [, <vlist>] )
+#xtranslate WVT_SETPOPUPMENU        ( [<vlist,...>] )    =>  WVW_SETPOPUPMENU        ( NIL [, <vlist>] )
+#xtranslate WVT_GETLASTMENUEVENT    ( [<vlist,...>] )    =>  WVW_GETLASTMENUEVENT    ( NIL [, <vlist>] )
+#xtranslate WVT_SETMENUKEYEVENT     ( [<vlist,...>] )    =>  WVW_SETMENUKEYEVENT     ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWMENUBAR         ( [<vlist,...>] )    =>  WVW_DRAWMENUBAR         ( NIL [, <vlist>] )
+#xtranslate WVT_SETWINDOWCENTRE     ( [<vlist,...>] )    =>  WVW_SETWINDOWCENTRE     ( NIL [, <vlist>] )
+#xtranslate WVT_PROCESSMESSAGES     ( [<vlist,...>] )    =>  WVW_PROCESSMESSAGES     ( NIL [, <vlist>] )
+#xtranslate WVT_GETTITLE            ( [<vlist,...>] )    =>  WVW_GETTITLE            ( NIL [, <vlist>] )
+#xtranslate WVT_INVALIDATERECT      ( [<vlist,...>] )    =>  WVW_INVALIDATERECT      ( NIL [, <vlist>] )
+#xtranslate WVT_CLIENTTOSCREEN      ( [<vlist,...>] )    =>  WVW_CLIENTTOSCREEN      ( NIL [, <vlist>] )
+#xtranslate WVT_SETFONT             ( [<vlist,...>] )    =>  WVW_SETFONT             ( NIL [, <vlist>] )
+#xtranslate WVT_SETICON             ( [<vlist,...>] )    =>  WVW_SETICON             ( NIL [, <vlist>] )
+#xtranslate WVT_SETTITLE            ( [<vlist,...>] )    =>  WVW_SETTITLE            ( NIL [, <vlist>] )
+#xtranslate WVT_SETWINDOWPOS        ( [<vlist,...>] )    =>  WVW_SETWINDOWPOS        ( NIL [, <vlist>] )
+#xtranslate WVT_GETWINDOWHANDLE     ( [<vlist,...>] )    =>  WVW_GETWINDOWHANDLE     ( NIL [, <vlist>] )
+#xtranslate WVT_SETCODEPAGE         ( [<vlist,...>] )    =>  WVW_SETCODEPAGE         ( NIL [, <vlist>] )
+#xtranslate WVT_CENTERWINDOW        ( [<vlist,...>] )    =>  WVW_CENTERWINDOW        ( NIL [, <vlist>] )
+#xtranslate WVT_SETMOUSEMOVE        ( [<vlist,...>] )    =>  WVW_SETMOUSEMOVE        ( NIL [, <vlist>] )
+#xtranslate WVT_GETXYFROMROWCOL     ( [<vlist,...>] )    =>  WVW_GETXYFROMROWCOL     ( NIL [, <vlist>] )
+#xtranslate WVT_GETFONTINFO         ( [<vlist,...>] )    =>  WVW_GETFONTINFO         ( NIL [, <vlist>] )
+#xtranslate WVT_MINIMIZE            ( [<vlist,...>] )    =>  WVW_MINIMIZE            ( NIL [, <vlist>] )
+#xtranslate WVT_MAXIMIZE            ( [<vlist,...>] )    =>  WVW_MAXIMIZE            ( NIL [, <vlist>] )
+#xtranslate WVT_SETONTOP            ( [<vlist,...>] )    =>  WVW_SETONTOP            ( NIL [, <vlist>] )
+#xtranslate WVT_SETASNORMAL         ( [<vlist,...>] )    =>  WVW_SETASNORMAL         ( NIL [, <vlist>] )
+#xtranslate WVT_SAVESCREEN          ( [<vlist,...>] )    =>  WVW_SAVESCREEN          ( NIL [, <vlist>] )
+#xtranslate WVT_RESTSCREEN          ( [<vlist,...>] )    =>  WVW_RESTSCREEN          ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWLABELOBJ        ( [<vlist,...>] )    =>  WVW_DRAWLABELOBJ        ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWTOOLBUTTONSTATE ( [<vlist,...>] )    =>  WVW_DRAWTOOLBUTTONSTATE ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWSCROLLBUTTON    ( [<vlist,...>] )    =>  WVW_DRAWSCROLLBUTTON    ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWSCROLLTHUMBVERT ( [<vlist,...>] )    =>  WVW_DRAWSCROLLTHUMBVERT ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWSCROLLTHUMBHORZ ( [<vlist,...>] )    =>  WVW_DRAWSCROLLTHUMBHORZ ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWSHADEDRECT      ( [<vlist,...>] )    =>  WVW_DRAWSHADEDRECT      ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWTEXTBOX         ( [<vlist,...>] )    =>  WVW_DRAWTEXTBOX         ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWPROGRESSBAR     ( [<vlist,...>] )    =>  WVW_DRAWPROGRESSBAR     ( NIL [, <vlist>] )
+#xtranslate WVT_TRACKPOPUPMENU      ( [<vlist,...>] )    =>  WVW_TRACKPOPUPMENU      ( NIL [, <vlist>] )
+#xtranslate WVT_GETMENU             ( [<vlist,...>] )    =>  WVW_GETMENU             ( NIL [, <vlist>] )
+#xtranslate WVT_SHOWWINDOW          ( [<vlist,...>] )    =>  WVW_SHOWWINDOW          ( NIL [, <vlist>] )
+#xtranslate WVT_UPDATEWINDOW        ( [<vlist,...>] )    =>  WVW_UPDATEWINDOW        ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWBOXGET          ( [<vlist,...>] )    =>  WVW_DRAWBOXGET          ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWBOXRAISED       ( [<vlist,...>] )    =>  WVW_DRAWBOXRAISED       ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWBOXRECESSED     ( [<vlist,...>] )    =>  WVW_DRAWBOXRECESSED     ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWBOXGROUP        ( [<vlist,...>] )    =>  WVW_DRAWBOXGROUP        ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWBOXGROUPRAISED  ( [<vlist,...>] )    =>  WVW_DRAWBOXGROUPRAISED  ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWIMAGE           ( [<vlist,...>] )    =>  WVW_DRAWIMAGE           ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWLABEL           ( [<vlist,...>] )    =>  WVW_DRAWLABEL           ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWOUTLINE         ( [<vlist,...>] )    =>  WVW_DRAWOUTLINE         ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWLINE            ( [<vlist,...>] )    =>  WVW_DRAWLINE            ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWELLIPSE         ( [<vlist,...>] )    =>  WVW_DRAWELLIPSE         ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWRECTANGLE       ( [<vlist,...>] )    =>  WVW_DRAWRECTANGLE       ( NIL [, <vlist>] )
+#xtranslate WVT_FILLRECTANGLE       ( [<vlist,...>] )    =>  WVW_FILLRECTANGLE       ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWCOLORRECT       ( [<vlist,...>] )    =>  WVW_DRAWCOLORRECT       ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWROUNDRECT       ( [<vlist,...>] )    =>  WVW_DRAWROUNDRECT       ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWFOCUSRECT       ( [<vlist,...>] )    =>  WVW_DRAWFOCUSRECT       ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWGRIDHORZ        ( [<vlist,...>] )    =>  WVW_DRAWGRIDHORZ        ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWGRIDVERT        ( [<vlist,...>] )    =>  WVW_DRAWGRIDVERT        ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWBUTTON          ( [<vlist,...>] )    =>  WVW_DRAWBUTTON          ( NIL [, <vlist>] )

-#xtranslate WVT_SETMOUSEPOS         ([<vlist,...>])    =>  WVW_SETMOUSEPOS         (NIL [, <vlist>])
+#xtranslate WVT_SETMOUSEPOS         ( [<vlist,...>] )    =>  WVW_SETMOUSEPOS         ( NIL [, <vlist>] )

 /* in gtwvt no pending rect is reflected as {0,0,0,0}
   in gtwvw no pending rect is reflected as {y1,x1,y2,x2} where y1 > y2 or x1 > x2
   thus we need some temporary var to check this exception
 */
-#xtranslate WVT_GETPAINTRECT        ([<vlist,...>])    =>  ( _wvwtemp_ := WVW_GETPAINTRECT( NIL [, <vlist>])  ;
-                                                           , iif(_wvwtemp_\[1\] > _wvwtemp_\[3\] .OR. _wvwtemp_\[2\] > _wvwtemp_\[4\], ;
-                                                                 { 0, 0, 0, 0 }, _wvwtemp_ ) )
+#xtranslate WVT_GETPAINTRECT        ( [<vlist,...>] )    =>  ( _wvwtemp_ := WVW_GETPAINTRECT( NIL [, <vlist>] ), ;
+                                                             iif( _wvwtemp_\[ 1 \] > _wvwtemp_\[ 3 \] .OR. _wvwtemp_\[ 2 \] > _wvwtemp_\[ 4 \], ;
+                                                                  { 0, 0, 0, 0 }, _wvwtemp_ ) )

-#xtranslate WVT_SETPOINTER          ([<vlist,...>])    =>  WVW_SETPOINTER          (NIL [, <vlist>])
-#xtranslate WVT_DRAWPICTURE         ([<vlist,...>])    =>  WVW_DRAWPICTURE         (NIL [, <vlist>])
-#xtranslate WVT_DRAWLABELEX         ([<vlist,...>])    =>  WVW_DRAWLABELEX         (NIL [, <vlist>])
-#xtranslate WVT_DRAWLINEEX          ([<vlist,...>])    =>  WVW_DRAWLINEEX          (NIL [, <vlist>])
-#xtranslate WVT_DRAWOUTLINEEX       ([<vlist,...>])    =>  WVW_DRAWOUTLINEEX       (NIL [, <vlist>])
-#xtranslate WVT_MESSAGEBOX          ([<vlist,...>])    =>  WVW_MESSAGEBOX          (NIL [, <vlist>])
-#xtranslate WVT_SETTOOLTIPACTIVE    ([<vlist,...>])    =>  WVW_SETTOOLTIPACTIVE    (NIL [, <vlist>])
-#xtranslate WVT_SETTOOLTIP          ([<vlist,...>])    =>  WVW_SETTOOLTIP          (NIL [, <vlist>])
-#xtranslate WVT_SETTOOLTIPTEXT      ([<vlist,...>])    =>  WVW_SETTOOLTIPTEXT      (NIL [, <vlist>])
-#xtranslate WVT_SETTOOLTIPMARGIN    ([<vlist,...>])    =>  WVW_SETTOOLTIPMARGIN    (NIL [, <vlist>])
-#xtranslate WVT_SETTOOLTIPWIDTH     ([<vlist,...>])    =>  WVW_SETTOOLTIPWIDTH     (NIL [, <vlist>])
-#xtranslate WVT_SETTOOLTIPBKCOLOR   ([<vlist,...>])    =>  WVW_SETTOOLTIPBKCOLOR   (NIL [, <vlist>])
-#xtranslate WVT_SETTOOLTIPTEXTCOLOR ([<vlist,...>])    =>  WVW_SETTOOLTIPTEXTCOLOR (NIL [, <vlist>])
-#xtranslate WVT_SETTOOLTIPTITLE     ([<vlist,...>])    =>  WVW_SETTOOLTIPTITLE     (NIL [, <vlist>])
-#xtranslate WVT_GETTOOLTIPWIDTH     ([<vlist,...>])    =>  WVW_GETTOOLTIPWIDTH     (NIL [, <vlist>])
-#xtranslate WVT_GETTOOLTIPBKCOLOR   ([<vlist,...>])    =>  WVW_GETTOOLTIPBKCOLOR   (NIL [, <vlist>])
-#xtranslate WVT_GETTOOLTIPTEXTCOLOR ([<vlist,...>])    =>  WVW_GETTOOLTIPTEXTCOLOR (NIL [, <vlist>])
+#xtranslate WVT_SETPOINTER          ( [<vlist,...>] )    =>  WVW_SETPOINTER          ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWPICTURE         ( [<vlist,...>] )    =>  WVW_DRAWPICTURE         ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWLABELEX         ( [<vlist,...>] )    =>  WVW_DRAWLABELEX         ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWLINEEX          ( [<vlist,...>] )    =>  WVW_DRAWLINEEX          ( NIL [, <vlist>] )
+#xtranslate WVT_DRAWOUTLINEEX       ( [<vlist,...>] )    =>  WVW_DRAWOUTLINEEX       ( NIL [, <vlist>] )
+#xtranslate WVT_MESSAGEBOX          ( [<vlist,...>] )    =>  WVW_MESSAGEBOX          ( NIL [, <vlist>] )
+#xtranslate WVT_SETTOOLTIPACTIVE    ( [<vlist,...>] )    =>  WVW_SETTOOLTIPACTIVE    ( NIL [, <vlist>] )
+#xtranslate WVT_SETTOOLTIP          ( [<vlist,...>] )    =>  WVW_SETTOOLTIP          ( NIL [, <vlist>] )
+#xtranslate WVT_SETTOOLTIPTEXT      ( [<vlist,...>] )    =>  WVW_SETTOOLTIPTEXT      ( NIL [, <vlist>] )
+#xtranslate WVT_SETTOOLTIPMARGIN    ( [<vlist,...>] )    =>  WVW_SETTOOLTIPMARGIN    ( NIL [, <vlist>] )
+#xtranslate WVT_SETTOOLTIPWIDTH     ( [<vlist,...>] )    =>  WVW_SETTOOLTIPWIDTH     ( NIL [, <vlist>] )
+#xtranslate WVT_SETTOOLTIPBKCOLOR   ( [<vlist,...>] )    =>  WVW_SETTOOLTIPBKCOLOR   ( NIL [, <vlist>] )
+#xtranslate WVT_SETTOOLTIPTEXTCOLOR ( [<vlist,...>] )    =>  WVW_SETTOOLTIPTEXTCOLOR ( NIL [, <vlist>] )
+#xtranslate WVT_SETTOOLTIPTITLE     ( [<vlist,...>] )    =>  WVW_SETTOOLTIPTITLE     ( NIL [, <vlist>] )
+#xtranslate WVT_GETTOOLTIPWIDTH     ( [<vlist,...>] )    =>  WVW_GETTOOLTIPWIDTH     ( NIL [, <vlist>] )
+#xtranslate WVT_GETTOOLTIPBKCOLOR   ( [<vlist,...>] )    =>  WVW_GETTOOLTIPBKCOLOR   ( NIL [, <vlist>] )
+#xtranslate WVT_GETTOOLTIPTEXTCOLOR ( [<vlist,...>] )    =>  WVW_GETTOOLTIPTEXTCOLOR ( NIL [, <vlist>] )

 /********************************************************************
 Timer functions. WARNING: WVT implementation is slightly different.
 *********************************************************************/

-#xtranslate WVT_SETTIMER   ([<vlist,...>])    =>  WVW_SETTIMER  (NIL [, <vlist>])
-#xtranslate WVT_KILLTIMER  ([<vlist,...>])    =>  WVW_KILLTIMER (NIL [, <vlist>])
+#xtranslate WVT_SETTIMER   ( [<vlist,...>] )    =>  WVW_SETTIMER  ( NIL [, <vlist>] )
+#xtranslate WVT_KILLTIMER  ( [<vlist,...>] )    =>  WVW_KILLTIMER ( NIL [, <vlist>] )

 /********************************************************************
 WVW_DRAWSTATUSBAR is for compatibility only.
 Recommended to use WVW_SBxxxx functions instead.
 *********************************************************************/
-#xtranslate WVT_DRAWSTATUSBAR ([<vlist,...>])          =>  WVW_DRAWSTATUSBAR (NIL [, <vlist>])
+#xtranslate WVT_DRAWSTATUSBAR ( [<vlist,...>] )          =>  WVW_DRAWSTATUSBAR ( NIL [, <vlist>] )

 /********************************************************************
 Native Statusbar functions. Currently none in WVT.
@@ -267,21 +267,21 @@ PART-3: RESERVED FUNCTION NAMES ("callback" prg functions, called by gtwvw)

 */

-#xtranslate FUNCTION WVT_PAINT([<vlist,...>]) => FUNCTION WVW_PAINT( nWinNum [,<vlist>] )
-#xtranslate PROCEDURE WVT_PAINT([<vlist,...>]) => PROCEDURE WVW_PAINT( nWinNum [,<vlist>] )
-#xtranslate WVT_PAINT([<vlist,...>]) => WVW_PAINT( NIL [,<vlist>] )
+#xtranslate FUNCTION WVT_PAINT( [<vlist,...>] ) => FUNCTION WVW_PAINT( nWinNum [,<vlist>] )
+#xtranslate PROCEDURE WVT_PAINT( [<vlist,...>] ) => PROCEDURE WVW_PAINT( nWinNum [,<vlist>] )
+#xtranslate WVT_PAINT( [<vlist,...>] ) => WVW_PAINT( NIL [,<vlist>] )

-#xtranslate FUNCTION WVT_SETFOCUS([<vlist,...>])  => FUNCTION WVW_SETFOCUS( nWinNum [,<vlist>] )
-#xtranslate PROCEDURE WVT_SETFOCUS([<vlist,...>])  => PROCEDURE WVW_SETFOCUS( nWinNum [,<vlist>] )
-#xtranslate WVT_SETFOCUS([<vlist,...>]) => WVW_SETFOCUS( NIL [,<vlist>] )
+#xtranslate FUNCTION WVT_SETFOCUS( [<vlist,...>] )  => FUNCTION WVW_SETFOCUS( nWinNum [,<vlist>] )
+#xtranslate PROCEDURE WVT_SETFOCUS( [<vlist,...>] )  => PROCEDURE WVW_SETFOCUS( nWinNum [,<vlist>] )
+#xtranslate WVT_SETFOCUS( [<vlist,...>] ) => WVW_SETFOCUS( NIL [,<vlist>] )

-#xtranslate FUNCTION WVT_KILLFOCUS([<vlist,...>]) => FUNCTION WVW_KILLFOCUS( nWinNum [,<vlist>] )
-#xtranslate PROCEDURE WVT_KILLFOCUS([<vlist,...>]) => PROCEDURE WVW_KILLFOCUS( nWinNum [,<vlist>] )
-#xtranslate WVT_KILLFOCUS([<vlist,...>]) => WVW_KILLFOCUS( NIL [,<vlist>] )
+#xtranslate FUNCTION WVT_KILLFOCUS( [<vlist,...>] ) => FUNCTION WVW_KILLFOCUS( nWinNum [,<vlist>] )
+#xtranslate PROCEDURE WVT_KILLFOCUS( [<vlist,...>] ) => PROCEDURE WVW_KILLFOCUS( nWinNum [,<vlist>] )
+#xtranslate WVT_KILLFOCUS( [<vlist,...>] ) => WVW_KILLFOCUS( NIL [,<vlist>] )

-#xtranslate FUNCTION WVT_MOUSE([<vlist,...>]) => FUNCTION WVW_MOUSE( nWinNum [,<vlist>] )
-#xtranslate PROCEDURE WVT_MOUSE([<vlist,...>]) => PROCEDURE WVW_MOUSE( nWinNum [,<vlist>] )
-#xtranslate WVT_MOUSE([<vlist,...>]) => WVW_MOUSE( NIL [,<vlist>] )
+#xtranslate FUNCTION WVT_MOUSE( [<vlist,...>] ) => FUNCTION WVW_MOUSE( nWinNum [,<vlist>] )
+#xtranslate PROCEDURE WVT_MOUSE( [<vlist,...>] ) => PROCEDURE WVW_MOUSE( nWinNum [,<vlist>] )
+#xtranslate WVT_MOUSE( [<vlist,...>] ) => WVW_MOUSE( NIL [,<vlist>] )

 #xtranslate FUNCTION WVT_TIMER() => FUNCTION WVW_TIMER( nWinNum, hWnd, message, wParam, lParam )
 #xtranslate PROCEDURE WVT_TIMER() => PROCEDURE WVW_TIMER( nWinNum, hWnd, message, wParam, lParam )
--- a/harbour/extras/hbvpdf/hbvpdf.hbp
+++ b/harbour/extras/hbvpdf/hbvpdf.hbp
@@ -9,6 +9,10 @@

 -w3 -es2

+-hbx=hbvpdf.hbx
+
+hbvpdf.hbx
+
 hbvpdf.prg
 hbvpsup.prg

--- a/harbour/extras/hbvpdf/hbvpdf.hbx
+++ b/harbour/extras/hbvpdf/hbvpdf.hbx
@@ -0,0 +1,80 @@
+/*
+ * $Id$
+ */
+
+/* --------------------------------------------------------------------
+ * NOTE: You can add manual override which functions to include or
+ *       exclude from automatically generated EXTERNAL/DYNAMIC list.
+ *          Syntax: // HB_FUNC_INCLUDE <func>
+ *                  // HB_FUNC_EXCLUDE <func>
+ */
+
+/* --------------------------------------------------------------------
+ * WARNING: Automatically generated code below. DO NOT EDIT!
+ *          Regenerate using hbmk2 '-hbx=' option.
+ */
+
+#ifndef __HBEXTERN_CH__HBVPDF__
+#define __HBEXTERN_CH__HBVPDF__
+
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBVPDF__ANNOUNCE )
+   ANNOUNCE __HBEXTERN__HBVPDF__
+#endif
+
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBVPDF__REQUEST )
+   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
+#endif
+
+DYNAMIC PDFATSAY
+DYNAMIC PDFBOLD
+DYNAMIC PDFBOLDITALIC
+DYNAMIC PDFBOOKADD
+DYNAMIC PDFBOOKCLOSE
+DYNAMIC PDFBOOKOPEN
+DYNAMIC PDFBOX
+DYNAMIC PDFBOX1
+DYNAMIC PDFCENTER
+DYNAMIC PDFCLOSE
+DYNAMIC PDFCLOSEHEADER
+DYNAMIC PDFCREATEHEADER
+DYNAMIC PDFDELETEHEADER
+DYNAMIC PDFDISABLEHEADER
+DYNAMIC PDFDRAWHEADER
+DYNAMIC PDFEDITOFFHEADER
+DYNAMIC PDFEDITONHEADER
+DYNAMIC PDFENABLEHEADER
+DYNAMIC PDFHEADER
+DYNAMIC PDFIMAGE
+DYNAMIC PDFIMAGEINFO
+DYNAMIC PDFINIT
+DYNAMIC PDFITALIC
+DYNAMIC PDFJPEGINFO
+DYNAMIC PDFLEN
+DYNAMIC PDFMARGINS
+DYNAMIC PDFNEWLINE
+DYNAMIC PDFNEWPAGE
+DYNAMIC PDFNORMAL
+DYNAMIC PDFOPEN
+DYNAMIC PDFOPENHEADER
+DYNAMIC PDFPAGENUMBER
+DYNAMIC PDFPAGEORIENT
+DYNAMIC PDFPAGESIZE
+DYNAMIC PDFREVERSE
+DYNAMIC PDFRJUST
+DYNAMIC PDFSAVEHEADER
+DYNAMIC PDFSETFONT
+DYNAMIC PDFSETLPI
+DYNAMIC PDFSTRINGB
+DYNAMIC PDFTEXT
+DYNAMIC PDFTEXTCOUNT
+DYNAMIC PDFTEXTWIDTH
+DYNAMIC PDFTIFFINFO
+DYNAMIC PDFUNDERLINE
+DYNAMIC PDFWIDTH
+DYNAMIC __PDF_FONTSDAT
+
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBVPDF__REQUEST )
+   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
+#endif
+
+#endif
--- a/harbour/extras/hbvpdf/hbvpdf.prg
+++ b/harbour/extras/hbvpdf/hbvpdf.prg
@@ -945,7 +945,7 @@ FUNCTION pdfOpen( cFile, nLen, lOptimize )

   // TOFIX: This external file dependency should be removed.

-   cTemp := vpdf_FontsDat() // times, times-bold, times-italic, times-bolditalic, helvetica..., courier... // 0.04
+   cTemp := __pdf_FontsDat() // times, times-bold, times-italic, times-bolditalic, helvetica..., courier... // 0.04
   n1 := Len( cTemp ) / ( 2 * n2 )
   t_aReport[ FONTWIDTH ] := Array( n1, n2 )

--- a/harbour/extras/hbvpdf/hbvpsup.prg
+++ b/harbour/extras/hbvpdf/hbvpsup.prg
@@ -2,5 +2,5 @@
 * $Id$
 */

-FUNCTION vpdf_FontsDat()
+FUNCTION __pdf_FontsDat()
   #pragma __streaminclude "fonts.dat" | RETURN %s
--- a/harbour/extras/hbxlsxml/hbxlsxml.hbp
+++ b/harbour/extras/hbxlsxml/hbxlsxml.hbp
@@ -9,6 +9,10 @@

 -w3 -es2

+-hbx=hbxlsxml.hbx
+
+hbxlsxml.hbx
+
 xlsxml.prg
 xlsxml_s.prg
 xlsxml_y.prg
--- a/harbour/extras/hbxlsxml/hbxlsxml.hbx
+++ b/harbour/extras/hbxlsxml/hbxlsxml.hbx
@@ -0,0 +1,38 @@
+/*
+ * $Id$
+ */
+
+/* --------------------------------------------------------------------
+ * NOTE: You can add manual override which functions to include or
+ *       exclude from automatically generated EXTERNAL/DYNAMIC list.
+ *          Syntax: // HB_FUNC_INCLUDE <func>
+ *                  // HB_FUNC_EXCLUDE <func>
+ */
+
+/* --------------------------------------------------------------------
+ * WARNING: Automatically generated code below. DO NOT EDIT!
+ *          Regenerate using hbmk2 '-hbx=' option.
+ */
+
+#ifndef __HBEXTERN_CH__HBXLSXML__
+#define __HBEXTERN_CH__HBXLSXML__
+
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBXLSXML__ANNOUNCE )
+   ANNOUNCE __HBEXTERN__HBXLSXML__
+#endif
+
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBXLSXML__REQUEST )
+   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
+#endif
+
+DYNAMIC ExcelWriterXML
+DYNAMIC ExcelWriterXML_Sheet
+DYNAMIC ExcelWriterXML_Style
+DYNAMIC StrToHtml
+DYNAMIC StrToHtmlSpecial
+
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBXLSXML__REQUEST )
+   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
+#endif
+
+#endif
--- a/harbour/extras/hbxlsxml/xlsxml.prg
+++ b/harbour/extras/hbxlsxml/xlsxml.prg
@@ -261,12 +261,12 @@ METHOD ExcelWriterXML:writeData( target )
      format:bgColor( "red" )
   ENDIF

-   IF ! Empty( ::cDocTitle   ); docTitle   := "<Title>"   + StrToHtmlEspecial( ::cDocTitle   ) + "</Title>"   + hb_eol(); ENDIF
-   IF ! Empty( ::cDocSubject ); docSubject := "<Subject>" + StrToHtmlEspecial( ::cDocSubject ) + "</Subject>" + hb_eol(); ENDIF
-   IF ! Empty( ::cDocAuthor  ); docAuthor  := "<Author>"  + StrToHtmlEspecial( ::cDocAuthor  ) + "</Author>"  + hb_eol(); ENDIF
-   IF ! Empty( ::cDocCreated ); docCreated := "<Created>" + StrToHtmlEspecial( ::cDocCreated ) + "</Created>" + hb_eol(); ENDIF
-   IF ! Empty( ::cDocManager ); docManager := "<Manager>" + StrToHtmlEspecial( ::cDocManager ) + "</Manager>" + hb_eol(); ENDIF
-   IF ! Empty( ::cDocCompany ); docCompany := "<Company>" + StrToHtmlEspecial( ::cDocCompany ) + "</Company>" + hb_eol(); ENDIF
+   IF ! Empty( ::cDocTitle   ); docTitle   := "<Title>"   + StrToHtmlSpecial( ::cDocTitle   ) + "</Title>"   + hb_eol(); ENDIF
+   IF ! Empty( ::cDocSubject ); docSubject := "<Subject>" + StrToHtmlSpecial( ::cDocSubject ) + "</Subject>" + hb_eol(); ENDIF
+   IF ! Empty( ::cDocAuthor  ); docAuthor  := "<Author>"  + StrToHtmlSpecial( ::cDocAuthor  ) + "</Author>"  + hb_eol(); ENDIF
+   IF ! Empty( ::cDocCreated ); docCreated := "<Created>" + StrToHtmlSpecial( ::cDocCreated ) + "</Created>" + hb_eol(); ENDIF
+   IF ! Empty( ::cDocManager ); docManager := "<Manager>" + StrToHtmlSpecial( ::cDocManager ) + "</Manager>" + hb_eol(); ENDIF
+   IF ! Empty( ::cDocCompany ); docCompany := "<Company>" + StrToHtmlSpecial( ::cDocCompany ) + "</Company>" + hb_eol(); ENDIF

   xml := '<?xml version="1.0"?>' + hb_eol()
   xml += '<?mso-application progid="Excel.Sheet"?>' + hb_eol()
@@ -362,7 +362,7 @@ METHOD ExcelWriterXML:docCompany( company )

   RETURN NIL

-FUNCTION STRTOHTML( xtxt )
+FUNCTION StrToHtml( xtxt )

   LOCAL afrm, i, xret := "", xpos

@@ -393,8 +393,7 @@ FUNCTION STRTOHTML( xtxt )
      { "Õ", "&Otilde;" }, ;
      { "Ú", "&Uacute;" }, ;
      { "Ü", "&Uuml;"   }, ;
-      { "-", "&ndash;"  } ;
-      }
+      { "-", "&ndash;"  } }

   FOR i := 1 TO Len( xtxt )
      IF ( xpos := AScan( afrm, {| x | SubStr( xtxt, i, 1 ) == hb_UTF8ToStr( x[ 1 ] ) } ) ) > 0
@@ -406,18 +405,17 @@ FUNCTION STRTOHTML( xtxt )

   RETURN xret

-FUNCTION STRTOHTMLESPECIAL( xtxt )
+FUNCTION StrToHtmlSpecial( xtxt )

   LOCAL afrm, i, xret := "", xpos

-   xtxt := exretiraAcentos( xtxt )
+   xtxt := RemoveAccents( xtxt )
   afrm := { ;
      { "&", "&amp;"  }, ;
      { '"', "&quot;" }, ;
      { "'", "&#039;" }, ;
      { "<", "&lt;"   }, ;
-      { ">", "&gt;"   } ;
-      }
+      { ">", "&gt;"   } }

   FOR i := 1 TO Len( xtxt )
      IF ( xpos := AScan( afrm, {| x | SubStr( xtxt, i, 1 ) == x[ 1 ] } ) ) > 0
@@ -429,7 +427,7 @@ FUNCTION STRTOHTMLESPECIAL( xtxt )

   RETURN xret

-FUNCTION EXRETIRAACENTOS( xtxt )
+STATIC FUNCTION RemoveAccents( xtxt )

   LOCAL afrm, i, xret := "", xpos

@@ -462,8 +460,7 @@ FUNCTION EXRETIRAACENTOS( xtxt )
      { "Ü", "U" }, ;
      { "ª", "." }, ;
      { "º", "." }, ;
-      { "°", "." }  ;
-      }
+      { "°", "." } }

   FOR i := 1 TO Len( xtxt )
      IF ( xpos := AScan( afrm, {| x | SubStr( xtxt, i, 1 ) == hb_UTF8ToStr( x[ 1 ] ) } ) ) > 0
--- a/harbour/extras/hbxlsxml/xlsxml_s.prg
+++ b/harbour/extras/hbxlsxml/xlsxml_s.prg
@@ -260,7 +260,7 @@ METHOD ExcelWriterXML_Sheet:getSheetXML( handle )

            xml += "         <Cell " + style + ' ss:Index="' + hb_ntos( column ) + '" ' + URL + " " + mergeCell + " " + formula + ">" + hb_eol()
            xml += '            <Data ss:Type="' + type + '">'
-            xml += StrToHtmlEspecial( xData )
+            xml += StrToHtmlSpecial( xData )
            xml += "</Data>" + hb_eol()
            xml += comment
            xml += "         </Cell>" + hb_eol()
--- a/harbour/extras/hbxlsxml/xlsxml_y.prg
+++ b/harbour/extras/hbxlsxml/xlsxml_y.prg
@@ -661,7 +661,7 @@ METHOD ExcelWriterXML_Style:setNumberFormatDatetime()

   RETURN NIL

-FUNCTION getColorIE()
+STATIC FUNCTION getColorIE()

   LOCAL hcolor := { => }