diff --git a/harbour/ChangeLog b/harbour/ChangeLog index de400c72c2..b380a49145 100644 --- 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) diff --git a/harbour/extras/gtwvw/gtwvw.hbp b/harbour/extras/gtwvw/gtwvw.hbp index 44e118fd16..2d2c511df4 100644 --- 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 diff --git a/harbour/extras/gtwvw/gtwvw.hbx b/harbour/extras/gtwvw/gtwvw.hbx new file mode 100644 index 0000000000..795fc9740f --- /dev/null +++ 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 + * // HB_FUNC_EXCLUDE + */ + +/* -------------------------------------------------------------------- + * 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 => EXTERNAL +#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 => EXTERNAL +#endif + +#endif diff --git a/harbour/extras/gtwvw/tests/wvt2wvw.ch b/harbour/extras/gtwvw/tests/wvt2wvw.ch index 88c37da553..1be4f58100 100644 --- 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 ([]) => WVW_CREATEMENU ([]) -#xtranslate WVT_CREATEPOPUPMENU ([]) => WVW_CREATEPOPUPMENU ([]) -#xtranslate WVT_APPENDMENU ([]) => WVW_APPENDMENU ([]) -#xtranslate WVT_DELETEMENU ([]) => WVW_DELETEMENU ([]) -#xtranslate WVT_DESTROYMENU ([]) => WVW_DESTROYMENU ([]) -#xtranslate WVT_ENABLEMENUITEM ([]) => WVW_ENABLEMENUITEM ([]) -#xtranslate WVT_GETSCREENWIDTH ([]) => WVW_GETSCREENWIDTH ([]) -#xtranslate WVT_GETSCREENHEIGHT ([]) => WVW_GETSCREENHEIGHT ([]) -#xtranslate WVT_SETALTF4CLOSE ([]) => WVW_SETALTF4CLOSE ([]) -#xtranslate WVT_GETRGBCOLOR ([]) => WVW_GETRGBCOLOR ([]) -#xtranslate WVT_GETCLIPBOARD ([]) => WVW_GETCLIPBOARD ([]) -#xtranslate WVT_SETCLIPBOARD ([]) => WVW_SETCLIPBOARD ([]) -#xtranslate WVT_PASTEFROMCLIPBOARD ([]) => WVW_PASTEFROMCLIPBOARD ([]) -#xtranslate WVT_KEYBOARD ([]) => WVW_KEYBOARD ([]) -#xtranslate WVT_ISLBUTTONPRESSED ([]) => WVW_ISLBUTTONPRESSED ([]) -#xtranslate WVT_GETPALETTE ([]) => WVW_GETPALETTE ([]) -#xtranslate WVT_SETPALETTE ([]) => WVW_SETPALETTE ([]) -#xtranslate WVT_CREATEFONT ([]) => WVW_CREATEFONT ([]) -#xtranslate WVT_GETCURSORPOS ([]) => WVW_GETCURSORPOS ([]) -#xtranslate WVT_CHOOSEFONT ([]) => WVW_CHOOSEFONT ([]) -#xtranslate WVT_CHOOSECOLOR ([]) => WVW_CHOOSECOLOR ([]) -#xtranslate WVT_LOADPICTURE ([]) => WVW_LOADPICTURE ([]) -#xtranslate WVT_LOADFONT ([]) => WVW_LOADFONT ([]) -#xtranslate WVT_LOADPEN ([]) => WVW_LOADPEN ([]) -#xtranslate WVT_SETPEN ([]) => WVW_SETPEN ([]) -#xtranslate WVT_SETBRUSH ([]) => WVW_SETBRUSH ([]) +#xtranslate WVT_CREATEMENU ( [] ) => WVW_CREATEMENU ( [] ) +#xtranslate WVT_CREATEPOPUPMENU ( [] ) => WVW_CREATEPOPUPMENU ( [] ) +#xtranslate WVT_APPENDMENU ( [] ) => WVW_APPENDMENU ( [] ) +#xtranslate WVT_DELETEMENU ( [] ) => WVW_DELETEMENU ( [] ) +#xtranslate WVT_DESTROYMENU ( [] ) => WVW_DESTROYMENU ( [] ) +#xtranslate WVT_ENABLEMENUITEM ( [] ) => WVW_ENABLEMENUITEM ( [] ) +#xtranslate WVT_GETSCREENWIDTH ( [] ) => WVW_GETSCREENWIDTH ( [] ) +#xtranslate WVT_GETSCREENHEIGHT ( [] ) => WVW_GETSCREENHEIGHT ( [] ) +#xtranslate WVT_SETALTF4CLOSE ( [] ) => WVW_SETALTF4CLOSE ( [] ) +#xtranslate WVT_GETRGBCOLOR ( [] ) => WVW_GETRGBCOLOR ( [] ) +#xtranslate WVT_GETCLIPBOARD ( [] ) => WVW_GETCLIPBOARD ( [] ) +#xtranslate WVT_SETCLIPBOARD ( [] ) => WVW_SETCLIPBOARD ( [] ) +#xtranslate WVT_PASTEFROMCLIPBOARD ( [] ) => WVW_PASTEFROMCLIPBOARD ( [] ) +#xtranslate WVT_KEYBOARD ( [] ) => WVW_KEYBOARD ( [] ) +#xtranslate WVT_ISLBUTTONPRESSED ( [] ) => WVW_ISLBUTTONPRESSED ( [] ) +#xtranslate WVT_GETPALETTE ( [] ) => WVW_GETPALETTE ( [] ) +#xtranslate WVT_SETPALETTE ( [] ) => WVW_SETPALETTE ( [] ) +#xtranslate WVT_CREATEFONT ( [] ) => WVW_CREATEFONT ( [] ) +#xtranslate WVT_GETCURSORPOS ( [] ) => WVW_GETCURSORPOS ( [] ) +#xtranslate WVT_CHOOSEFONT ( [] ) => WVW_CHOOSEFONT ( [] ) +#xtranslate WVT_CHOOSECOLOR ( [] ) => WVW_CHOOSECOLOR ( [] ) +#xtranslate WVT_LOADPICTURE ( [] ) => WVW_LOADPICTURE ( [] ) +#xtranslate WVT_LOADFONT ( [] ) => WVW_LOADFONT ( [] ) +#xtranslate WVT_LOADPEN ( [] ) => WVW_LOADPEN ( [] ) +#xtranslate WVT_SETPEN ( [] ) => WVW_SETPEN ( [] ) +#xtranslate WVT_SETBRUSH ( [] ) => WVW_SETBRUSH ( [] ) -#xtranslate WVT_CREATEDIALOGDYNAMIC([]) => WVW_CREATEDIALOGDYNAMIC([]) -#xtranslate WVT_CREATEDIALOGMODAL ([]) => WVW_CREATEDIALOGMODAL ([]) -#xtranslate WVT__MAKEDLGTEMPLATE ([]) => WVW__MAKEDLGTEMPLATE ([]) -#xtranslate WVT_LBADDSTRING ([]) => WVW_LBADDSTRING ([]) -#xtranslate WVT_LBSETCURSEL ([]) => WVW_LBSETCURSEL ([]) -#xtranslate WVT_CBADDSTRING ([]) => WVW_CBADDSTRING ([]) -#xtranslate WVT_CBSETCURSEL ([]) => WVW_CBSETCURSEL ([]) -#xtranslate WVT_DLGSETICON ([]) => WVW_DLGSETICON ([]) +#xtranslate WVT_CREATEDIALOGDYNAMIC( [] ) => WVW_CREATEDIALOGDYNAMIC( [] ) +#xtranslate WVT_CREATEDIALOGMODAL ( [] ) => WVW_CREATEDIALOGMODAL ( [] ) +#xtranslate WVT__MAKEDLGTEMPLATE ( [] ) => WVW__MAKEDLGTEMPLATE ( [] ) +#xtranslate WVT_LBADDSTRING ( [] ) => WVW_LBADDSTRING ( [] ) +#xtranslate WVT_LBSETCURSEL ( [] ) => WVW_LBSETCURSEL ( [] ) +#xtranslate WVT_CBADDSTRING ( [] ) => WVW_CBADDSTRING ( [] ) +#xtranslate WVT_CBSETCURSEL ( [] ) => WVW_CBSETCURSEL ( [] ) +#xtranslate WVT_DLGSETICON ( [] ) => WVW_DLGSETICON ( [] ) /******************************************************************** These functions do not exist in WVT. *********************************************************************/ -//WVT_SETVERTCARET ([]) => WVW_SETVERTCARET ([]) -//WVT_SETDEFLINESPACING ([]) => WVW_SETDEFLINESPACING ([]) +//WVT_SETVERTCARET ( [] ) => WVW_SETVERTCARET ( [] ) +//WVT_SETDEFLINESPACING ( [] ) => WVW_SETDEFLINESPACING ( [] ) /********************************************************************/ /******************************************************************** @@ -86,103 +86,103 @@ PART-2: WINDOW DEPENDENT (additional nWinNum parameter) */ -#xtranslate WVT_SETMENU ([]) => WVW_SETMENU (NIL [, ]) -#xtranslate WVT_SETPOPUPMENU ([]) => WVW_SETPOPUPMENU (NIL [, ]) -#xtranslate WVT_GETLASTMENUEVENT ([]) => WVW_GETLASTMENUEVENT (NIL [, ]) -#xtranslate WVT_SETMENUKEYEVENT ([]) => WVW_SETMENUKEYEVENT (NIL [, ]) -#xtranslate WVT_DRAWMENUBAR ([]) => WVW_DRAWMENUBAR (NIL [, ]) -#xtranslate WVT_SETWINDOWCENTRE ([]) => WVW_SETWINDOWCENTRE (NIL [, ]) -#xtranslate WVT_PROCESSMESSAGES ([]) => WVW_PROCESSMESSAGES (NIL [, ]) -#xtranslate WVT_GETTITLE ([]) => WVW_GETTITLE (NIL [, ]) -#xtranslate WVT_INVALIDATERECT ([]) => WVW_INVALIDATERECT (NIL [, ]) -#xtranslate WVT_CLIENTTOSCREEN ([]) => WVW_CLIENTTOSCREEN (NIL [, ]) -#xtranslate WVT_SETFONT ([]) => WVW_SETFONT (NIL [, ]) -#xtranslate WVT_SETICON ([]) => WVW_SETICON (NIL [, ]) -#xtranslate WVT_SETTITLE ([]) => WVW_SETTITLE (NIL [, ]) -#xtranslate WVT_SETWINDOWPOS ([]) => WVW_SETWINDOWPOS (NIL [, ]) -#xtranslate WVT_GETWINDOWHANDLE ([]) => WVW_GETWINDOWHANDLE (NIL [, ]) -#xtranslate WVT_SETCODEPAGE ([]) => WVW_SETCODEPAGE (NIL [, ]) -#xtranslate WVT_CENTERWINDOW ([]) => WVW_CENTERWINDOW (NIL [, ]) -#xtranslate WVT_SETMOUSEMOVE ([]) => WVW_SETMOUSEMOVE (NIL [, ]) -#xtranslate WVT_GETXYFROMROWCOL ([]) => WVW_GETXYFROMROWCOL (NIL [, ]) -#xtranslate WVT_GETFONTINFO ([]) => WVW_GETFONTINFO (NIL [, ]) -#xtranslate WVT_MINIMIZE ([]) => WVW_MINIMIZE (NIL [, ]) -#xtranslate WVT_MAXIMIZE ([]) => WVW_MAXIMIZE (NIL [, ]) -#xtranslate WVT_SETONTOP ([]) => WVW_SETONTOP (NIL [, ]) -#xtranslate WVT_SETASNORMAL ([]) => WVW_SETASNORMAL (NIL [, ]) -#xtranslate WVT_SAVESCREEN ([]) => WVW_SAVESCREEN (NIL [, ]) -#xtranslate WVT_RESTSCREEN ([]) => WVW_RESTSCREEN (NIL [, ]) -#xtranslate WVT_DRAWLABELOBJ ([]) => WVW_DRAWLABELOBJ (NIL [, ]) -#xtranslate WVT_DRAWTOOLBUTTONSTATE ([]) => WVW_DRAWTOOLBUTTONSTATE (NIL [, ]) -#xtranslate WVT_DRAWSCROLLBUTTON ([]) => WVW_DRAWSCROLLBUTTON (NIL [, ]) -#xtranslate WVT_DRAWSCROLLTHUMBVERT ([]) => WVW_DRAWSCROLLTHUMBVERT (NIL [, ]) -#xtranslate WVT_DRAWSCROLLTHUMBHORZ ([]) => WVW_DRAWSCROLLTHUMBHORZ (NIL [, ]) -#xtranslate WVT_DRAWSHADEDRECT ([]) => WVW_DRAWSHADEDRECT (NIL [, ]) -#xtranslate WVT_DRAWTEXTBOX ([]) => WVW_DRAWTEXTBOX (NIL [, ]) -#xtranslate WVT_DRAWPROGRESSBAR ([]) => WVW_DRAWPROGRESSBAR (NIL [, ]) -#xtranslate WVT_TRACKPOPUPMENU ([]) => WVW_TRACKPOPUPMENU (NIL [, ]) -#xtranslate WVT_GETMENU ([]) => WVW_GETMENU (NIL [, ]) -#xtranslate WVT_SHOWWINDOW ([]) => WVW_SHOWWINDOW (NIL [, ]) -#xtranslate WVT_UPDATEWINDOW ([]) => WVW_UPDATEWINDOW (NIL [, ]) -#xtranslate WVT_DRAWBOXGET ([]) => WVW_DRAWBOXGET (NIL [, ]) -#xtranslate WVT_DRAWBOXRAISED ([]) => WVW_DRAWBOXRAISED (NIL [, ]) -#xtranslate WVT_DRAWBOXRECESSED ([]) => WVW_DRAWBOXRECESSED (NIL [, ]) -#xtranslate WVT_DRAWBOXGROUP ([]) => WVW_DRAWBOXGROUP (NIL [, ]) -#xtranslate WVT_DRAWBOXGROUPRAISED ([]) => WVW_DRAWBOXGROUPRAISED (NIL [, ]) -#xtranslate WVT_DRAWIMAGE ([]) => WVW_DRAWIMAGE (NIL [, ]) -#xtranslate WVT_DRAWLABEL ([]) => WVW_DRAWLABEL (NIL [, ]) -#xtranslate WVT_DRAWOUTLINE ([]) => WVW_DRAWOUTLINE (NIL [, ]) -#xtranslate WVT_DRAWLINE ([]) => WVW_DRAWLINE (NIL [, ]) -#xtranslate WVT_DRAWELLIPSE ([]) => WVW_DRAWELLIPSE (NIL [, ]) -#xtranslate WVT_DRAWRECTANGLE ([]) => WVW_DRAWRECTANGLE (NIL [, ]) -#xtranslate WVT_FILLRECTANGLE ([]) => WVW_FILLRECTANGLE (NIL [, ]) -#xtranslate WVT_DRAWCOLORRECT ([]) => WVW_DRAWCOLORRECT (NIL [, ]) -#xtranslate WVT_DRAWROUNDRECT ([]) => WVW_DRAWROUNDRECT (NIL [, ]) -#xtranslate WVT_DRAWFOCUSRECT ([]) => WVW_DRAWFOCUSRECT (NIL [, ]) -#xtranslate WVT_DRAWGRIDHORZ ([]) => WVW_DRAWGRIDHORZ (NIL [, ]) -#xtranslate WVT_DRAWGRIDVERT ([]) => WVW_DRAWGRIDVERT (NIL [, ]) -#xtranslate WVT_DRAWBUTTON ([]) => WVW_DRAWBUTTON (NIL [, ]) +#xtranslate WVT_SETMENU ( [] ) => WVW_SETMENU ( NIL [, ] ) +#xtranslate WVT_SETPOPUPMENU ( [] ) => WVW_SETPOPUPMENU ( NIL [, ] ) +#xtranslate WVT_GETLASTMENUEVENT ( [] ) => WVW_GETLASTMENUEVENT ( NIL [, ] ) +#xtranslate WVT_SETMENUKEYEVENT ( [] ) => WVW_SETMENUKEYEVENT ( NIL [, ] ) +#xtranslate WVT_DRAWMENUBAR ( [] ) => WVW_DRAWMENUBAR ( NIL [, ] ) +#xtranslate WVT_SETWINDOWCENTRE ( [] ) => WVW_SETWINDOWCENTRE ( NIL [, ] ) +#xtranslate WVT_PROCESSMESSAGES ( [] ) => WVW_PROCESSMESSAGES ( NIL [, ] ) +#xtranslate WVT_GETTITLE ( [] ) => WVW_GETTITLE ( NIL [, ] ) +#xtranslate WVT_INVALIDATERECT ( [] ) => WVW_INVALIDATERECT ( NIL [, ] ) +#xtranslate WVT_CLIENTTOSCREEN ( [] ) => WVW_CLIENTTOSCREEN ( NIL [, ] ) +#xtranslate WVT_SETFONT ( [] ) => WVW_SETFONT ( NIL [, ] ) +#xtranslate WVT_SETICON ( [] ) => WVW_SETICON ( NIL [, ] ) +#xtranslate WVT_SETTITLE ( [] ) => WVW_SETTITLE ( NIL [, ] ) +#xtranslate WVT_SETWINDOWPOS ( [] ) => WVW_SETWINDOWPOS ( NIL [, ] ) +#xtranslate WVT_GETWINDOWHANDLE ( [] ) => WVW_GETWINDOWHANDLE ( NIL [, ] ) +#xtranslate WVT_SETCODEPAGE ( [] ) => WVW_SETCODEPAGE ( NIL [, ] ) +#xtranslate WVT_CENTERWINDOW ( [] ) => WVW_CENTERWINDOW ( NIL [, ] ) +#xtranslate WVT_SETMOUSEMOVE ( [] ) => WVW_SETMOUSEMOVE ( NIL [, ] ) +#xtranslate WVT_GETXYFROMROWCOL ( [] ) => WVW_GETXYFROMROWCOL ( NIL [, ] ) +#xtranslate WVT_GETFONTINFO ( [] ) => WVW_GETFONTINFO ( NIL [, ] ) +#xtranslate WVT_MINIMIZE ( [] ) => WVW_MINIMIZE ( NIL [, ] ) +#xtranslate WVT_MAXIMIZE ( [] ) => WVW_MAXIMIZE ( NIL [, ] ) +#xtranslate WVT_SETONTOP ( [] ) => WVW_SETONTOP ( NIL [, ] ) +#xtranslate WVT_SETASNORMAL ( [] ) => WVW_SETASNORMAL ( NIL [, ] ) +#xtranslate WVT_SAVESCREEN ( [] ) => WVW_SAVESCREEN ( NIL [, ] ) +#xtranslate WVT_RESTSCREEN ( [] ) => WVW_RESTSCREEN ( NIL [, ] ) +#xtranslate WVT_DRAWLABELOBJ ( [] ) => WVW_DRAWLABELOBJ ( NIL [, ] ) +#xtranslate WVT_DRAWTOOLBUTTONSTATE ( [] ) => WVW_DRAWTOOLBUTTONSTATE ( NIL [, ] ) +#xtranslate WVT_DRAWSCROLLBUTTON ( [] ) => WVW_DRAWSCROLLBUTTON ( NIL [, ] ) +#xtranslate WVT_DRAWSCROLLTHUMBVERT ( [] ) => WVW_DRAWSCROLLTHUMBVERT ( NIL [, ] ) +#xtranslate WVT_DRAWSCROLLTHUMBHORZ ( [] ) => WVW_DRAWSCROLLTHUMBHORZ ( NIL [, ] ) +#xtranslate WVT_DRAWSHADEDRECT ( [] ) => WVW_DRAWSHADEDRECT ( NIL [, ] ) +#xtranslate WVT_DRAWTEXTBOX ( [] ) => WVW_DRAWTEXTBOX ( NIL [, ] ) +#xtranslate WVT_DRAWPROGRESSBAR ( [] ) => WVW_DRAWPROGRESSBAR ( NIL [, ] ) +#xtranslate WVT_TRACKPOPUPMENU ( [] ) => WVW_TRACKPOPUPMENU ( NIL [, ] ) +#xtranslate WVT_GETMENU ( [] ) => WVW_GETMENU ( NIL [, ] ) +#xtranslate WVT_SHOWWINDOW ( [] ) => WVW_SHOWWINDOW ( NIL [, ] ) +#xtranslate WVT_UPDATEWINDOW ( [] ) => WVW_UPDATEWINDOW ( NIL [, ] ) +#xtranslate WVT_DRAWBOXGET ( [] ) => WVW_DRAWBOXGET ( NIL [, ] ) +#xtranslate WVT_DRAWBOXRAISED ( [] ) => WVW_DRAWBOXRAISED ( NIL [, ] ) +#xtranslate WVT_DRAWBOXRECESSED ( [] ) => WVW_DRAWBOXRECESSED ( NIL [, ] ) +#xtranslate WVT_DRAWBOXGROUP ( [] ) => WVW_DRAWBOXGROUP ( NIL [, ] ) +#xtranslate WVT_DRAWBOXGROUPRAISED ( [] ) => WVW_DRAWBOXGROUPRAISED ( NIL [, ] ) +#xtranslate WVT_DRAWIMAGE ( [] ) => WVW_DRAWIMAGE ( NIL [, ] ) +#xtranslate WVT_DRAWLABEL ( [] ) => WVW_DRAWLABEL ( NIL [, ] ) +#xtranslate WVT_DRAWOUTLINE ( [] ) => WVW_DRAWOUTLINE ( NIL [, ] ) +#xtranslate WVT_DRAWLINE ( [] ) => WVW_DRAWLINE ( NIL [, ] ) +#xtranslate WVT_DRAWELLIPSE ( [] ) => WVW_DRAWELLIPSE ( NIL [, ] ) +#xtranslate WVT_DRAWRECTANGLE ( [] ) => WVW_DRAWRECTANGLE ( NIL [, ] ) +#xtranslate WVT_FILLRECTANGLE ( [] ) => WVW_FILLRECTANGLE ( NIL [, ] ) +#xtranslate WVT_DRAWCOLORRECT ( [] ) => WVW_DRAWCOLORRECT ( NIL [, ] ) +#xtranslate WVT_DRAWROUNDRECT ( [] ) => WVW_DRAWROUNDRECT ( NIL [, ] ) +#xtranslate WVT_DRAWFOCUSRECT ( [] ) => WVW_DRAWFOCUSRECT ( NIL [, ] ) +#xtranslate WVT_DRAWGRIDHORZ ( [] ) => WVW_DRAWGRIDHORZ ( NIL [, ] ) +#xtranslate WVT_DRAWGRIDVERT ( [] ) => WVW_DRAWGRIDVERT ( NIL [, ] ) +#xtranslate WVT_DRAWBUTTON ( [] ) => WVW_DRAWBUTTON ( NIL [, ] ) -#xtranslate WVT_SETMOUSEPOS ([]) => WVW_SETMOUSEPOS (NIL [, ]) +#xtranslate WVT_SETMOUSEPOS ( [] ) => WVW_SETMOUSEPOS ( NIL [, ] ) /* 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 ([]) => ( _wvwtemp_ := WVW_GETPAINTRECT( NIL [, ]) ; - , iif(_wvwtemp_\[1\] > _wvwtemp_\[3\] .OR. _wvwtemp_\[2\] > _wvwtemp_\[4\], ; - { 0, 0, 0, 0 }, _wvwtemp_ ) ) +#xtranslate WVT_GETPAINTRECT ( [] ) => ( _wvwtemp_ := WVW_GETPAINTRECT( NIL [, ] ), ; + iif( _wvwtemp_\[ 1 \] > _wvwtemp_\[ 3 \] .OR. _wvwtemp_\[ 2 \] > _wvwtemp_\[ 4 \], ; + { 0, 0, 0, 0 }, _wvwtemp_ ) ) -#xtranslate WVT_SETPOINTER ([]) => WVW_SETPOINTER (NIL [, ]) -#xtranslate WVT_DRAWPICTURE ([]) => WVW_DRAWPICTURE (NIL [, ]) -#xtranslate WVT_DRAWLABELEX ([]) => WVW_DRAWLABELEX (NIL [, ]) -#xtranslate WVT_DRAWLINEEX ([]) => WVW_DRAWLINEEX (NIL [, ]) -#xtranslate WVT_DRAWOUTLINEEX ([]) => WVW_DRAWOUTLINEEX (NIL [, ]) -#xtranslate WVT_MESSAGEBOX ([]) => WVW_MESSAGEBOX (NIL [, ]) -#xtranslate WVT_SETTOOLTIPACTIVE ([]) => WVW_SETTOOLTIPACTIVE (NIL [, ]) -#xtranslate WVT_SETTOOLTIP ([]) => WVW_SETTOOLTIP (NIL [, ]) -#xtranslate WVT_SETTOOLTIPTEXT ([]) => WVW_SETTOOLTIPTEXT (NIL [, ]) -#xtranslate WVT_SETTOOLTIPMARGIN ([]) => WVW_SETTOOLTIPMARGIN (NIL [, ]) -#xtranslate WVT_SETTOOLTIPWIDTH ([]) => WVW_SETTOOLTIPWIDTH (NIL [, ]) -#xtranslate WVT_SETTOOLTIPBKCOLOR ([]) => WVW_SETTOOLTIPBKCOLOR (NIL [, ]) -#xtranslate WVT_SETTOOLTIPTEXTCOLOR ([]) => WVW_SETTOOLTIPTEXTCOLOR (NIL [, ]) -#xtranslate WVT_SETTOOLTIPTITLE ([]) => WVW_SETTOOLTIPTITLE (NIL [, ]) -#xtranslate WVT_GETTOOLTIPWIDTH ([]) => WVW_GETTOOLTIPWIDTH (NIL [, ]) -#xtranslate WVT_GETTOOLTIPBKCOLOR ([]) => WVW_GETTOOLTIPBKCOLOR (NIL [, ]) -#xtranslate WVT_GETTOOLTIPTEXTCOLOR ([]) => WVW_GETTOOLTIPTEXTCOLOR (NIL [, ]) +#xtranslate WVT_SETPOINTER ( [] ) => WVW_SETPOINTER ( NIL [, ] ) +#xtranslate WVT_DRAWPICTURE ( [] ) => WVW_DRAWPICTURE ( NIL [, ] ) +#xtranslate WVT_DRAWLABELEX ( [] ) => WVW_DRAWLABELEX ( NIL [, ] ) +#xtranslate WVT_DRAWLINEEX ( [] ) => WVW_DRAWLINEEX ( NIL [, ] ) +#xtranslate WVT_DRAWOUTLINEEX ( [] ) => WVW_DRAWOUTLINEEX ( NIL [, ] ) +#xtranslate WVT_MESSAGEBOX ( [] ) => WVW_MESSAGEBOX ( NIL [, ] ) +#xtranslate WVT_SETTOOLTIPACTIVE ( [] ) => WVW_SETTOOLTIPACTIVE ( NIL [, ] ) +#xtranslate WVT_SETTOOLTIP ( [] ) => WVW_SETTOOLTIP ( NIL [, ] ) +#xtranslate WVT_SETTOOLTIPTEXT ( [] ) => WVW_SETTOOLTIPTEXT ( NIL [, ] ) +#xtranslate WVT_SETTOOLTIPMARGIN ( [] ) => WVW_SETTOOLTIPMARGIN ( NIL [, ] ) +#xtranslate WVT_SETTOOLTIPWIDTH ( [] ) => WVW_SETTOOLTIPWIDTH ( NIL [, ] ) +#xtranslate WVT_SETTOOLTIPBKCOLOR ( [] ) => WVW_SETTOOLTIPBKCOLOR ( NIL [, ] ) +#xtranslate WVT_SETTOOLTIPTEXTCOLOR ( [] ) => WVW_SETTOOLTIPTEXTCOLOR ( NIL [, ] ) +#xtranslate WVT_SETTOOLTIPTITLE ( [] ) => WVW_SETTOOLTIPTITLE ( NIL [, ] ) +#xtranslate WVT_GETTOOLTIPWIDTH ( [] ) => WVW_GETTOOLTIPWIDTH ( NIL [, ] ) +#xtranslate WVT_GETTOOLTIPBKCOLOR ( [] ) => WVW_GETTOOLTIPBKCOLOR ( NIL [, ] ) +#xtranslate WVT_GETTOOLTIPTEXTCOLOR ( [] ) => WVW_GETTOOLTIPTEXTCOLOR ( NIL [, ] ) /******************************************************************** Timer functions. WARNING: WVT implementation is slightly different. *********************************************************************/ -#xtranslate WVT_SETTIMER ([]) => WVW_SETTIMER (NIL [, ]) -#xtranslate WVT_KILLTIMER ([]) => WVW_KILLTIMER (NIL [, ]) +#xtranslate WVT_SETTIMER ( [] ) => WVW_SETTIMER ( NIL [, ] ) +#xtranslate WVT_KILLTIMER ( [] ) => WVW_KILLTIMER ( NIL [, ] ) /******************************************************************** WVW_DRAWSTATUSBAR is for compatibility only. Recommended to use WVW_SBxxxx functions instead. *********************************************************************/ -#xtranslate WVT_DRAWSTATUSBAR ([]) => WVW_DRAWSTATUSBAR (NIL [, ]) +#xtranslate WVT_DRAWSTATUSBAR ( [] ) => WVW_DRAWSTATUSBAR ( NIL [, ] ) /******************************************************************** 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([]) => FUNCTION WVW_PAINT( nWinNum [,] ) -#xtranslate PROCEDURE WVT_PAINT([]) => PROCEDURE WVW_PAINT( nWinNum [,] ) -#xtranslate WVT_PAINT([]) => WVW_PAINT( NIL [,] ) +#xtranslate FUNCTION WVT_PAINT( [] ) => FUNCTION WVW_PAINT( nWinNum [,] ) +#xtranslate PROCEDURE WVT_PAINT( [] ) => PROCEDURE WVW_PAINT( nWinNum [,] ) +#xtranslate WVT_PAINT( [] ) => WVW_PAINT( NIL [,] ) -#xtranslate FUNCTION WVT_SETFOCUS([]) => FUNCTION WVW_SETFOCUS( nWinNum [,] ) -#xtranslate PROCEDURE WVT_SETFOCUS([]) => PROCEDURE WVW_SETFOCUS( nWinNum [,] ) -#xtranslate WVT_SETFOCUS([]) => WVW_SETFOCUS( NIL [,] ) +#xtranslate FUNCTION WVT_SETFOCUS( [] ) => FUNCTION WVW_SETFOCUS( nWinNum [,] ) +#xtranslate PROCEDURE WVT_SETFOCUS( [] ) => PROCEDURE WVW_SETFOCUS( nWinNum [,] ) +#xtranslate WVT_SETFOCUS( [] ) => WVW_SETFOCUS( NIL [,] ) -#xtranslate FUNCTION WVT_KILLFOCUS([]) => FUNCTION WVW_KILLFOCUS( nWinNum [,] ) -#xtranslate PROCEDURE WVT_KILLFOCUS([]) => PROCEDURE WVW_KILLFOCUS( nWinNum [,] ) -#xtranslate WVT_KILLFOCUS([]) => WVW_KILLFOCUS( NIL [,] ) +#xtranslate FUNCTION WVT_KILLFOCUS( [] ) => FUNCTION WVW_KILLFOCUS( nWinNum [,] ) +#xtranslate PROCEDURE WVT_KILLFOCUS( [] ) => PROCEDURE WVW_KILLFOCUS( nWinNum [,] ) +#xtranslate WVT_KILLFOCUS( [] ) => WVW_KILLFOCUS( NIL [,] ) -#xtranslate FUNCTION WVT_MOUSE([]) => FUNCTION WVW_MOUSE( nWinNum [,] ) -#xtranslate PROCEDURE WVT_MOUSE([]) => PROCEDURE WVW_MOUSE( nWinNum [,] ) -#xtranslate WVT_MOUSE([]) => WVW_MOUSE( NIL [,] ) +#xtranslate FUNCTION WVT_MOUSE( [] ) => FUNCTION WVW_MOUSE( nWinNum [,] ) +#xtranslate PROCEDURE WVT_MOUSE( [] ) => PROCEDURE WVW_MOUSE( nWinNum [,] ) +#xtranslate WVT_MOUSE( [] ) => WVW_MOUSE( NIL [,] ) #xtranslate FUNCTION WVT_TIMER() => FUNCTION WVW_TIMER( nWinNum, hWnd, message, wParam, lParam ) #xtranslate PROCEDURE WVT_TIMER() => PROCEDURE WVW_TIMER( nWinNum, hWnd, message, wParam, lParam ) diff --git a/harbour/extras/hbvpdf/hbvpdf.hbp b/harbour/extras/hbvpdf/hbvpdf.hbp index 0ce1dabb5a..180f9bd94b 100644 --- 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 diff --git a/harbour/extras/hbvpdf/hbvpdf.hbx b/harbour/extras/hbvpdf/hbvpdf.hbx new file mode 100644 index 0000000000..1abd406c7e --- /dev/null +++ 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 + * // HB_FUNC_EXCLUDE + */ + +/* -------------------------------------------------------------------- + * 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 => EXTERNAL +#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 => EXTERNAL +#endif + +#endif diff --git a/harbour/extras/hbvpdf/hbvpdf.prg b/harbour/extras/hbvpdf/hbvpdf.prg index eef601ccc5..45cc3484ce 100644 --- 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 ) diff --git a/harbour/extras/hbvpdf/hbvpsup.prg b/harbour/extras/hbvpdf/hbvpsup.prg index fa3254fa60..d85e8d7d8a 100644 --- 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 diff --git a/harbour/extras/hbxlsxml/hbxlsxml.hbp b/harbour/extras/hbxlsxml/hbxlsxml.hbp index dbf7389c9b..995b6dfd74 100644 --- 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 diff --git a/harbour/extras/hbxlsxml/hbxlsxml.hbx b/harbour/extras/hbxlsxml/hbxlsxml.hbx new file mode 100644 index 0000000000..f72969e7b5 --- /dev/null +++ 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 + * // HB_FUNC_EXCLUDE + */ + +/* -------------------------------------------------------------------- + * 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 => EXTERNAL +#endif + +DYNAMIC ExcelWriterXML +DYNAMIC ExcelWriterXML_Sheet +DYNAMIC ExcelWriterXML_Style +DYNAMIC StrToHtml +DYNAMIC StrToHtmlSpecial + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBXLSXML__REQUEST ) + #uncommand DYNAMIC => EXTERNAL +#endif + +#endif diff --git a/harbour/extras/hbxlsxml/xlsxml.prg b/harbour/extras/hbxlsxml/xlsxml.prg index b93789a324..ff1485c50b 100644 --- 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 := "" + StrToHtmlEspecial( ::cDocTitle ) + "" + hb_eol(); ENDIF - IF ! Empty( ::cDocSubject ); docSubject := "" + StrToHtmlEspecial( ::cDocSubject ) + "" + hb_eol(); ENDIF - IF ! Empty( ::cDocAuthor ); docAuthor := "" + StrToHtmlEspecial( ::cDocAuthor ) + "" + hb_eol(); ENDIF - IF ! Empty( ::cDocCreated ); docCreated := "" + StrToHtmlEspecial( ::cDocCreated ) + "" + hb_eol(); ENDIF - IF ! Empty( ::cDocManager ); docManager := "" + StrToHtmlEspecial( ::cDocManager ) + "" + hb_eol(); ENDIF - IF ! Empty( ::cDocCompany ); docCompany := "" + StrToHtmlEspecial( ::cDocCompany ) + "" + hb_eol(); ENDIF + IF ! Empty( ::cDocTitle ); docTitle := "" + StrToHtmlSpecial( ::cDocTitle ) + "" + hb_eol(); ENDIF + IF ! Empty( ::cDocSubject ); docSubject := "" + StrToHtmlSpecial( ::cDocSubject ) + "" + hb_eol(); ENDIF + IF ! Empty( ::cDocAuthor ); docAuthor := "" + StrToHtmlSpecial( ::cDocAuthor ) + "" + hb_eol(); ENDIF + IF ! Empty( ::cDocCreated ); docCreated := "" + StrToHtmlSpecial( ::cDocCreated ) + "" + hb_eol(); ENDIF + IF ! Empty( ::cDocManager ); docManager := "" + StrToHtmlSpecial( ::cDocManager ) + "" + hb_eol(); ENDIF + IF ! Empty( ::cDocCompany ); docCompany := "" + StrToHtmlSpecial( ::cDocCompany ) + "" + hb_eol(); ENDIF xml := '' + hb_eol() xml += '' + 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 ) { "Õ", "Õ" }, ; { "Ú", "Ú" }, ; { "Ü", "Ü" }, ; - { "-", "–" } ; - } + { "-", "–" } } 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 := { ; { "&", "&" }, ; { '"', """ }, ; { "'", "'" }, ; { "<", "<" }, ; - { ">", ">" } ; - } + { ">", ">" } } 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 diff --git a/harbour/extras/hbxlsxml/xlsxml_s.prg b/harbour/extras/hbxlsxml/xlsxml_s.prg index 1ff22c603d..653c2033eb 100644 --- a/harbour/extras/hbxlsxml/xlsxml_s.prg +++ b/harbour/extras/hbxlsxml/xlsxml_s.prg @@ -260,7 +260,7 @@ METHOD ExcelWriterXML_Sheet:getSheetXML( handle ) xml += " " + hb_eol() xml += ' ' - xml += StrToHtmlEspecial( xData ) + xml += StrToHtmlSpecial( xData ) xml += "" + hb_eol() xml += comment xml += " " + hb_eol() diff --git a/harbour/extras/hbxlsxml/xlsxml_y.prg b/harbour/extras/hbxlsxml/xlsxml_y.prg index 207d187c61..5aafbd2626 100644 --- 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 := { => }