From 8340825fd564bb29fea4397b4e10d7b185a27acc Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 13 Sep 2017 21:34:26 +0000 Subject: [PATCH] 2017-09-13 21:33 UTC Viktor Szakats (vszakats users.noreply.github.com) * bin/check.hb * contrib/gtwvw/* * sync some text with the 3.4 fork --- ChangeLog.txt | 5 +++ bin/check.hb | 6 ++- contrib/gtwvw/checkbox.c | 54 +++++++------------------- contrib/gtwvw/editbox.c | 33 ++++------------ contrib/gtwvw/gtwvwd.c | 46 +++++++++------------- contrib/gtwvw/menubar.c | 44 ++++----------------- contrib/gtwvw/pushbut.c | 50 +++++++----------------- contrib/gtwvw/statbar.c | 38 ++++-------------- contrib/gtwvw/toolbar.c | 33 ++++------------ contrib/gtwvw/wvt2wvw.ch | 84 +++++++++++++++++----------------------- contrib/gtwvw/wvwdraw.c | 33 ++++------------ contrib/gtwvw/wvwutils.c | 33 ++++------------ 12 files changed, 135 insertions(+), 324 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 4062728912..43d88a68eb 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,11 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ +2017-09-13 21:33 UTC Viktor Szakats (vszakats users.noreply.github.com) + * bin/check.hb + * contrib/gtwvw/* + * sync some text with the 3.4 fork + 2017-09-13 21:17 UTC Viktor Szakats (vszakats users.noreply.github.com) * bin/3rdpatch.hb ; 2017-08-24 19:43 UTC Viktor Szakats (vszakats users.noreply.github.com) diff --git a/bin/check.hb b/bin/check.hb index 1c53e2089f..a05a28d965 100755 --- a/bin/check.hb +++ b/bin/check.hb @@ -93,8 +93,10 @@ STATIC FUNCTION CheckFile( cName, /* @ */ aErr, lApplyFixes ) LOCAL aCanBeUpper := { ; "Makefile", ; - "README.md", ; - "COPYING.txt", ; + "DEPRECATED.*", ; + "LICENSE.*", ; + "README.*", ; + "WARNING.*", ; "*/RELNOTES.txt", ; "*/HARBOUR_README_*.txt", ; "ChangeLog.txt", ; diff --git a/contrib/gtwvw/checkbox.c b/contrib/gtwvw/checkbox.c index 04ea95f665..d3ae7a2019 100644 --- a/contrib/gtwvw/checkbox.c +++ b/contrib/gtwvw/checkbox.c @@ -2,43 +2,24 @@ * Video subsystem for Windows using GUI windows instead of Console * with multiple windows support * Copyright 2004 Budyanto Dj. - * gtwvw checkbox/progressbar functions + * GTWVW checkbox functions * GTWVW is initially created based on: - * * =Id: gtwvt.c,v 1.60 2004-01-26 08:14:07 vouchcac Exp = - * Video subsystem for Windows using GUI windows instead of Console - * Copyright 2003 Peter Rees - * Rees Software & Systems Ltd - * based on - * Bcc ConIO Video subsystem by - * Copyright 2002 Marek Paliwoda - * Copyright 2002 Przemyslaw Czerpak - * Video subsystem for Windows compilers - * Copyright 1999-2000 Paul Tucker - * Copyright 2002 Przemyslaw Czerpak - * - * The following parts are Copyright of the individual authors. - * - * - * Copyright 1999 David G. Holm - * hb_gt_wvw_Tone() - * - * See COPYING.txt for licensing terms. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option ) + * the Free Software Foundation; either version 2, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.txt. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site https://www.gnu.org/ ). + * along with this program; see the file LICENSE.txt. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA (or visit https://www.gnu.org/licenses/). * * As a special exception, the Harbour Project gives permission for * additional uses of the text contained in its release of Harbour. @@ -56,7 +37,7 @@ * Project under the name Harbour. If you copy code from other * Harbour Project or Free Software Foundation releases into a copy of * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading + * not apply to the code that you add in this way. To avoid misleading * anyone as to the status of such modified files, you must delete * this exception notice from them. * @@ -68,12 +49,8 @@ #include "hbgtwvw.h" - -/* CHECKBOX begins */ - - -/*wvw_cxCreate( [nWinNum], nTop, nLeft, nBottom, nRight, cText, cImage/nImage, bBlock, aOffset,; - * nStretchBitmap, lMap3Dcolors) +/* wvw_cxCreate( [nWinNum], nTop, nLeft, nBottom, nRight, cText, cImage/nImage, bBlock, aOffset, ; + * nStretchBitmap, lMap3Dcolors, @hControl, nStyle ) * create CHECKBOX for window nWinNum * nTop: row of top/left corner (in character unit) * nLeft: col of top/left corner (in character unit) @@ -88,11 +65,11 @@ * 0.5: bitmap covers 50% of button * 0: bitmap is not stretch * (default is 1) - * lMap3Dcolors: defaults to .f. - * if .t. the following color mapping will be performed: - * RGB(192,192,192) --> COLOR_3DFACE ("transparent") - * RGB(128,128,128) --> COLOR_3DSHADOW - * RGB(223,223,223) --> COLOR_3DLIGHT + * lMap3Dcolors: defaults to .F. + * if .T. the following color mapping will be performed: + * RGB( 192, 192, 192 ) --> COLOR_3DFACE ("transparent") + * RGB( 128, 128, 128 ) --> COLOR_3DSHADOW + * RGB( 223, 223, 223 ) --> COLOR_3DLIGHT * This might be desirable to have transparent effect. * LIMITATION: this will work on 256 colored bitmaps only * @@ -107,10 +84,7 @@ * * returns control id of newly created CHECKBOX of windows nWinNum * returns 0 if failed - * - * example: */ - HB_FUNC( WVW_CXCREATE ) { UINT usWinNum = WVW_WHICH_WINDOW; diff --git a/contrib/gtwvw/editbox.c b/contrib/gtwvw/editbox.c index eb651fbfaf..f7f0499c53 100644 --- a/contrib/gtwvw/editbox.c +++ b/contrib/gtwvw/editbox.c @@ -2,43 +2,24 @@ * Video subsystem for Windows using GUI windows instead of Console * with multiple windows support * Copyright 2004 Budyanto Dj. - * gtwvw edit functions + * GTWVW edit functions * GTWVW is initially created based on: - * * =Id: gtwvt.c,v 1.60 2004-01-26 08:14:07 vouchcac Exp = - * Video subsystem for Windows using GUI windows instead of Console - * Copyright 2003 Peter Rees - * Rees Software & Systems Ltd - * based on - * Bcc ConIO Video subsystem by - * Copyright 2002 Marek Paliwoda - * Copyright 2002 Przemyslaw Czerpak - * Video subsystem for Windows compilers - * Copyright 1999-2000 Paul Tucker - * Copyright 2002 Przemyslaw Czerpak - * - * The following parts are Copyright of the individual authors. - * - * - * Copyright 1999 David G. Holm - * hb_gt_wvw_Tone() - * - * See COPYING.txt for licensing terms. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option ) + * the Free Software Foundation; either version 2, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.txt. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site https://www.gnu.org/ ). + * along with this program; see the file LICENSE.txt. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA (or visit https://www.gnu.org/licenses/). * * As a special exception, the Harbour Project gives permission for * additional uses of the text contained in its release of Harbour. @@ -56,7 +37,7 @@ * Project under the name Harbour. If you copy code from other * Harbour Project or Free Software Foundation releases into a copy of * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading + * not apply to the code that you add in this way. To avoid misleading * anyone as to the status of such modified files, you must delete * this exception notice from them. * diff --git a/contrib/gtwvw/gtwvwd.c b/contrib/gtwvw/gtwvwd.c index 02095854cc..118709be9c 100644 --- a/contrib/gtwvw/gtwvwd.c +++ b/contrib/gtwvw/gtwvwd.c @@ -4,8 +4,8 @@ * Copyright 2004 Budyanto Dj. * * GTWVW is initially created based on: - * * =Id: gtwvt.c,v 1.60 2004-01-26 08:14:07 vouchcac Exp = + * * Video subsystem for Windows using GUI windows instead of Console * Copyright 2003 Peter Rees * Rees Software & Systems Ltd @@ -17,28 +17,36 @@ * Copyright 1999-2000 Paul Tucker * Copyright 2002 Przemyslaw Czerpak * - * The following parts are Copyright of the individual authors. - * - * * Copyright 1999 David G. Holm * hb_gt_wvw_Tone() * - * See COPYING.txt for licensing terms. + * (C) 2003-2004 Giancarlo Niccolai + * Standard xplatform GT Info system, + * Graphical object system and event system. + * hb_gtInfo() And GTO_* implementation. + * + * (C) 2004 Mauricio Abre + * Cross-GT, multi-platform Graphics API + * + * (C) 2009 Cristiam Azambuja + * Marson de Paula + * Data Cempro Informatica (www.datacempro.com.br) + * Refactoring for xHarbour 1.2.1 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option ) + * the Free Software Foundation; either version 2, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.txt. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site https://www.gnu.org/ ). + * along with this program; see the file LICENSE.txt. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA (or visit https://www.gnu.org/licenses/). * * As a special exception, the Harbour Project gives permission for * additional uses of the text contained in its release of Harbour. @@ -56,7 +64,7 @@ * Project under the name Harbour. If you copy code from other * Harbour Project or Free Software Foundation releases into a copy of * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading + * not apply to the code that you add in this way. To avoid misleading * anyone as to the status of such modified files, you must delete * this exception notice from them. * @@ -66,22 +74,6 @@ * */ -/* - * Individual authors: - * (C) 2003-2004 Giancarlo Niccolai - * Standard xplatform GT Info system, - * Graphical object system and event system. - * hb_gtInfo() And GTO_* implementation. - * - * (C) 2004 Mauricio Abre - * Cross-GT, multiplatform Graphics API - * - * (C) 2009 Cristiam Azambuja - * Marson de Paula - * Data Cempro Informatica (www.datacempro.com.br) - * Refactoring for xHarbour 1.2.1 - */ - #include "hbgtwvw.h" #if defined( __WATCOMC__ ) diff --git a/contrib/gtwvw/menubar.c b/contrib/gtwvw/menubar.c index dc2c6ec26f..e011f29f71 100644 --- a/contrib/gtwvw/menubar.c +++ b/contrib/gtwvw/menubar.c @@ -1,44 +1,20 @@ /* - * Video subsystem for Windows using GUI windows instead of Console - * with multiple windows support - * Copyright 2004 Budyanto Dj. - * gtwvw menu Functions - * GTWVW is initially created based on: - * - * =Id: gtwvt.c,v 1.60 2004-01-26 08:14:07 vouchcac Exp = - * Video subsystem for Windows using GUI windows instead of Console - * Copyright 2003 Peter Rees - * Rees Software & Systems Ltd - * based on - * Bcc ConIO Video subsystem by - * Copyright 2002 Marek Paliwoda - * Copyright 2002 Przemyslaw Czerpak - * Video subsystem for Windows compilers - * Copyright 1999-2000 Paul Tucker - * Copyright 2002 Przemyslaw Czerpak - * - * The following parts are Copyright of the individual authors. - * - * - * Copyright 1999 David G. Holm - * hb_gt_wvw_Tone() - * - * See COPYING.txt for licensing terms. + * Copyright Peter Rees * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option ) + * the Free Software Foundation; either version 2, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.txt. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site https://www.gnu.org/ ). + * along with this program; see the file LICENSE.txt. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA (or visit https://www.gnu.org/licenses/). * * As a special exception, the Harbour Project gives permission for * additional uses of the text contained in its release of Harbour. @@ -56,7 +32,7 @@ * Project under the name Harbour. If you copy code from other * Harbour Project or Free Software Foundation releases into a copy of * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading + * not apply to the code that you add in this way. To avoid misleading * anyone as to the status of such modified files, you must delete * this exception notice from them. * @@ -68,12 +44,6 @@ #include "hbgtwvw.h" - -/* */ -/* Peter Rees */ -/* */ - - HB_FUNC( WVW_SETMENU ) { UINT usWinNum = WVW_WHICH_WINDOW; diff --git a/contrib/gtwvw/pushbut.c b/contrib/gtwvw/pushbut.c index c4484664e1..973c3bc42a 100644 --- a/contrib/gtwvw/pushbut.c +++ b/contrib/gtwvw/pushbut.c @@ -2,43 +2,24 @@ * Video subsystem for Windows using GUI windows instead of Console * with multiple windows support * Copyright 2004 Budyanto Dj. - * gtwvw pushbutton/ combobox functions + * GTWVW pushbutton functions * GTWVW is initially created based on: - * * =Id: gtwvt.c,v 1.60 2004-01-26 08:14:07 vouchcac Exp = - * Video subsystem for Windows using GUI windows instead of Console - * Copyright 2003 Peter Rees - * Rees Software & Systems Ltd - * based on - * Bcc ConIO Video subsystem by - * Copyright 2002 Marek Paliwoda - * Copyright 2002 Przemyslaw Czerpak - * Video subsystem for Windows compilers - * Copyright 1999-2000 Paul Tucker - * Copyright 2002 Przemyslaw Czerpak - * - * The following parts are Copyright of the individual authors. - * - * - * Copyright 1999 David G. Holm - * hb_gt_wvw_Tone() - * - * See COPYING.txt for licensing terms. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option ) + * the Free Software Foundation; either version 2, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.txt. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site https://www.gnu.org/ ). + * along with this program; see the file LICENSE.txt. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA (or visit https://www.gnu.org/licenses/). * * As a special exception, the Harbour Project gives permission for * additional uses of the text contained in its release of Harbour. @@ -56,7 +37,7 @@ * Project under the name Harbour. If you copy code from other * Harbour Project or Free Software Foundation releases into a copy of * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading + * not apply to the code that you add in this way. To avoid misleading * anyone as to the status of such modified files, you must delete * this exception notice from them. * @@ -68,8 +49,8 @@ #include "hbgtwvw.h" -/* wvw_pbCreate( [nWinNum], nTop, nLeft, nBottom, nRight, cText, cImage/nImage, bBlock, aOffset,; - * nStretchBitmap, lMap3Dcolors) +/* wvw_pbCreate( [nWinNum], nTop, nLeft, nBottom, nRight, cText, cImage/nImage, bBlock, aOffset, ; + * nStretchBitmap, lMap3Dcolors, @hControl, nStyle ) * create pushbutton for window nWinNum * nTop: row of top/left corner (in character unit) * nLeft: col of top/left corner (in character unit) @@ -87,11 +68,11 @@ * 0: bitmap is not stretch * (default is 1) * - * lMap3Dcolors: defaults to .f. - * if .t. the following color mapping will be performed: - * RGB(192,192,192) --> COLOR_3DFACE ("transparent") - * RGB(128,128,128) --> COLOR_3DSHADOW - * RGB(223,223,223) --> COLOR_3DLIGHT + * lMap3Dcolors: defaults to .F. + * if .T. the following color mapping will be performed: + * RGB( 192, 192, 192 ) --> COLOR_3DFACE ("transparent") + * RGB( 128, 128, 128 ) --> COLOR_3DSHADOW + * RGB( 223, 223, 223 ) --> COLOR_3DLIGHT * This might be desirable to have transparent effect. * LIMITATION: this will work on 256 colored bitmaps only * @@ -106,10 +87,7 @@ * * returns control id of newly created pushbutton of windows nWinNum * returns 0 if failed - * - * example: */ - HB_FUNC( WVW_PBCREATE ) { UINT usWinNum = WVW_WHICH_WINDOW; diff --git a/contrib/gtwvw/statbar.c b/contrib/gtwvw/statbar.c index b98035575e..bb8cd95aa1 100644 --- a/contrib/gtwvw/statbar.c +++ b/contrib/gtwvw/statbar.c @@ -2,43 +2,24 @@ * Video subsystem for Windows using GUI windows instead of Console * with multiple windows support * Copyright 2004 Budyanto Dj. - * gtwvw statusbar/scrollbar functions + * GTWVW statusbar functions * GTWVW is initially created based on: - * * =Id: gtwvt.c,v 1.60 2004-01-26 08:14:07 vouchcac Exp = - * Video subsystem for Windows using GUI windows instead of Console - * Copyright 2003 Peter Rees - * Rees Software & Systems Ltd - * based on - * Bcc ConIO Video subsystem by - * Copyright 2002 Marek Paliwoda - * Copyright 2002 Przemyslaw Czerpak - * Video subsystem for Windows compilers - * Copyright 1999-2000 Paul Tucker - * Copyright 2002 Przemyslaw Czerpak - * - * The following parts are Copyright of the individual authors. - * - * - * Copyright 1999 David G. Holm - * hb_gt_wvw_Tone() - * - * See COPYING.txt for licensing terms. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option ) + * the Free Software Foundation; either version 2, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.txt. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site https://www.gnu.org/ ). + * along with this program; see the file LICENSE.txt. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA (or visit https://www.gnu.org/licenses/). * * As a special exception, the Harbour Project gives permission for * additional uses of the text contained in its release of Harbour. @@ -56,7 +37,7 @@ * Project under the name Harbour. If you copy code from other * Harbour Project or Free Software Foundation releases into a copy of * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading + * not apply to the code that you add in this way. To avoid misleading * anyone as to the status of such modified files, you must delete * this exception notice from them. * @@ -69,10 +50,7 @@ #include "hbgtwvw.h" -/* STATUS BAR */ - - -/*wvw_sbCreate( [nWinNum] ) +/* wvw_sbCreate( [nWinNum] ) * create status bar for window nWinNum, with one part. * returns handle to status bar of windows nWinNum * returns 0 if failed, eg. if there is already a status bar for this window diff --git a/contrib/gtwvw/toolbar.c b/contrib/gtwvw/toolbar.c index c923ab21f8..0cb389fa26 100644 --- a/contrib/gtwvw/toolbar.c +++ b/contrib/gtwvw/toolbar.c @@ -2,43 +2,24 @@ * Video subsystem for Windows using GUI windows instead of Console * with multiple windows support * Copyright 2004 Budyanto Dj. - * gtwvw toolbar and tooltips functions + * GTWVW toolbar functions * GTWVW is initially created based on: - * * =Id: gtwvt.c,v 1.60 2004-01-26 08:14:07 vouchcac Exp = - * Video subsystem for Windows using GUI windows instead of Console - * Copyright 2003 Peter Rees - * Rees Software & Systems Ltd - * based on - * Bcc ConIO Video subsystem by - * Copyright 2002 Marek Paliwoda - * Copyright 2002 Przemyslaw Czerpak - * Video subsystem for Windows compilers - * Copyright 1999-2000 Paul Tucker - * Copyright 2002 Przemyslaw Czerpak - * - * The following parts are Copyright of the individual authors. - * - * - * Copyright 1999 David G. Holm - * hb_gt_wvw_Tone() - * - * See COPYING.txt for licensing terms. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option ) + * the Free Software Foundation; either version 2, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.txt. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site https://www.gnu.org/ ). + * along with this program; see the file LICENSE.txt. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA (or visit https://www.gnu.org/licenses/). * * As a special exception, the Harbour Project gives permission for * additional uses of the text contained in its release of Harbour. @@ -56,7 +37,7 @@ * Project under the name Harbour. If you copy code from other * Harbour Project or Free Software Foundation releases into a copy of * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading + * not apply to the code that you add in this way. To avoid misleading * anyone as to the status of such modified files, you must delete * this exception notice from them. * diff --git a/contrib/gtwvw/wvt2wvw.ch b/contrib/gtwvw/wvt2wvw.ch index e65d2761c5..c90aedfbd8 100644 --- a/contrib/gtwvw/wvt2wvw.ch +++ b/contrib/gtwvw/wvt2wvw.ch @@ -1,19 +1,8 @@ -/* - Copyright 2004 Budyanto Dj. - - Mapping of gtwvt functions and their coresponding ones in gtwvw. - - header file to be included in your gtwvt program if you - wish to link it with gtwvw. - - WARNING: - This mapping is made globally. Should you find any error(s) please let me know. -*/ - -MEMVAR _wvwtemp_ +/* Copyright 2004 Budyanto Dj. + Mapping of GTWVT functions and their corresponding ones in GTWVW. + Header file to be included in your GTWVT program if you wish to link it with GTWVW. */ /* PART-1: WINDOW INDEPENDENT (the same parameter list) */ -/* ==================================================== */ #xtranslate Wvt_CreateMenu ( [] ) => wvw_CreateMenu ( [] ) #xtranslate Wvt_CreatePopupMenu ( [] ) => wvw_CreatePopupMenu ( [] ) @@ -51,31 +40,29 @@ MEMVAR _wvwtemp_ #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 ( [] ) /* PART-2: WINDOW DEPENDENT (additional nWinNum parameter) */ -/* ======================================================= */ /* Notes: - nWinNum parameter passed as NIL will be translated by gtwvw into : + nWinNum parameter passed as NIL will be translated by GTWVW into: IF MainCoordMode Topmost Window ELSE Current Window ENDIF - Since gtwvt application can't be in MainCoordMode, + Since GTWVT application cannot be in MainCoordMode, the following approach makes these functions work on current window. You may want to replace NIL with your own function/variable by which you can decide which window to direct your output to. -*/ + */ #xtranslate Wvt_SetMenu ( [] ) => wvw_SetMenu ( NIL [, ] ) #xtranslate Wvt_SetPopupMenu ( [] ) => wvw_SetPopupMenu ( NIL [, ] ) @@ -136,8 +123,8 @@ MEMVAR _wvwtemp_ #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 +/* 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 [, ] ), ; @@ -171,34 +158,33 @@ MEMVAR _wvwtemp_ #xtranslate Wvt_DrawStatusBar ( [] ) => wvw_DrawStatusBar ( NIL [, ] ) /* Native Statusbar functions. Currently none in WVT. - WVT uses different approach (Wvt_DrawStatusBar) */ -//wvw_sbCreate -//wvw_sbDestroy -//wvw_sbAddPart -//wvw_sbRefresh -//wvw_sbSetText -//wvw_sbGetText -//wvw_sbGetParts + WVT uses different approach (wvt_DrawStatusBar()) */ +//wvw_sbCreate() +//wvw_sbDestroy() +//wvw_sbAddPart() +//wvw_sbRefresh() +//wvw_sbSetText() +//wvw_sbGetText() +//wvw_sbGetParts() /* Toolbar functions. Currently none in WVT. WVT uses different approach. */ -//wvw_tbCreate -//wvw_tbAddButton -//wvw_tbButtonCount -//wvw_tbDelButton -//wvw_tbEnableButton -//wvw_tbDestroy +//wvw_tbCreate() +//wvw_tbAddButton() +//wvw_tbButtonCount() +//wvw_tbDelButton() +//wvw_tbEnableButton() +//wvw_tbDestroy() /* Scrollbar functions. Currently none in WVT. WVT uses different approach. */ -//wvw_xbCreate -//wvw_xbDestroy -//wvw_xbUpdate -//wvw_xbEnable +//wvw_xbCreate() +//wvw_xbDestroy() +//wvw_xbUpdate() +//wvw_xbEnable() /* Line Spacing. Currently none in WVT. */ -//wvw_SetLineSpacing +//wvw_SetLineSpacing() -/* PART-3: RESERVED FUNCTION NAMES ("callback" prg functions, called by gtwvw) */ -/* =========================================================================== */ +/* PART-3: RESERVED FUNCTION NAMES ("callback" .prg functions, called by GTWVW) */ /* Notes: @@ -210,18 +196,20 @@ MEMVAR _wvwtemp_ However, once you open a second window you you should decide what to do with nWinNum parameter in these callback functions. - Typically your WVT_xxx function will need adjustment like below: + Typically your WVT_*() function will need adjustment like below: - FUNCTION WVT_xxx(...) - LOCAL nOldWin := wvw_nSetCurWindow( nWinNum ) //<-- add this + FUNCTION WVT_*( ... ) - ...existing code... + LOCAL nOldWin := wvw_nSetCurWindow( nWinNum ) // <-- add this + + /* ...existing code... */ + + wvw_nSetCurWindow( nOldWin ) // <-- add this - wvw_nSetCurWindow( nOldWin ) //<--add this RETURN NIL Although the above may be enough, each individual function may need careful review - to make sure it follows gtwvw convention. For example, if you have multiple + to make sure it follows GTWVW convention. For example, if you have multiple exit points in that function. IMPORTANT NOTES ON MainCoord Mode: diff --git a/contrib/gtwvw/wvwdraw.c b/contrib/gtwvw/wvwdraw.c index 3b4f249caf..eef30e2425 100644 --- a/contrib/gtwvw/wvwdraw.c +++ b/contrib/gtwvw/wvwdraw.c @@ -2,43 +2,24 @@ * Video subsystem for Windows using GUI windows instead of Console * with multiple windows support * Copyright 2004 Budyanto Dj. - * gtwvw draw functions + * GTWVW draw functions * GTWVW is initially created based on: - * * =Id: gtwvt.c,v 1.60 2004-01-26 08:14:07 vouchcac Exp = - * Video subsystem for Windows using GUI windows instead of Console - * Copyright 2003 Peter Rees - * Rees Software & Systems Ltd - * based on - * Bcc ConIO Video subsystem by - * Copyright 2002 Marek Paliwoda - * Copyright 2002 Przemyslaw Czerpak - * Video subsystem for Windows compilers - * Copyright 1999-2000 Paul Tucker - * Copyright 2002 Przemyslaw Czerpak - * - * The following parts are Copyright of the individual authors. - * - * - * Copyright 1999 David G. Holm - * hb_gt_wvw_Tone() - * - * See COPYING.txt for licensing terms. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option ) + * the Free Software Foundation; either version 2, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.txt. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site https://www.gnu.org/ ). + * along with this program; see the file LICENSE.txt. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA (or visit https://www.gnu.org/licenses/). * * As a special exception, the Harbour Project gives permission for * additional uses of the text contained in its release of Harbour. @@ -56,7 +37,7 @@ * Project under the name Harbour. If you copy code from other * Harbour Project or Free Software Foundation releases into a copy of * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading + * not apply to the code that you add in this way. To avoid misleading * anyone as to the status of such modified files, you must delete * this exception notice from them. * diff --git a/contrib/gtwvw/wvwutils.c b/contrib/gtwvw/wvwutils.c index e59c7d8adb..01442b40aa 100644 --- a/contrib/gtwvw/wvwutils.c +++ b/contrib/gtwvw/wvwutils.c @@ -2,43 +2,24 @@ * Video subsystem for Windows using GUI windows instead of Console * with multiple windows support * Copyright 2004 Budyanto Dj. - * gtwvw draw functions + * GTWVW draw functions * GTWVW is initially created based on: - * * =Id: gtwvt.c,v 1.60 2004-01-26 08:14:07 vouchcac Exp = - * Video subsystem for Windows using GUI windows instead of Console - * Copyright 2003 Peter Rees - * Rees Software & Systems Ltd - * based on - * Bcc ConIO Video subsystem by - * Copyright 2002 Marek Paliwoda - * Copyright 2002 Przemyslaw Czerpak - * Video subsystem for Windows compilers - * Copyright 1999-2000 Paul Tucker - * Copyright 2002 Przemyslaw Czerpak - * - * The following parts are Copyright of the individual authors. - * - * - * Copyright 1999 David G. Holm - * hb_gt_wvw_Tone() - * - * See COPYING.txt for licensing terms. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option ) + * the Free Software Foundation; either version 2, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.txt. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site https://www.gnu.org/ ). + * along with this program; see the file LICENSE.txt. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA (or visit https://www.gnu.org/licenses/). * * As a special exception, the Harbour Project gives permission for * additional uses of the text contained in its release of Harbour. @@ -56,7 +37,7 @@ * Project under the name Harbour. If you copy code from other * Harbour Project or Free Software Foundation releases into a copy of * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading + * not apply to the code that you add in this way. To avoid misleading * anyone as to the status of such modified files, you must delete * this exception notice from them. *