From d79ae26158ecceadf12d0d170070ff03a871411b Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Wed, 20 Jun 2001 16:39:02 +0000 Subject: [PATCH] See ChangeLog entry 2001-06-20 12:30 UTC-0400 David G. Holm --- harbour/ChangeLog | 10 ++++++++ harbour/doc/en/license.txt | 2 -- harbour/doc/license.txt | 2 -- harbour/source/rtl/gtapi.c | 41 ++++++++++++++++++++++---------- harbour/source/rtl/gtwin/gtwin.c | 6 ++++- harbour/source/rtl/setpos.c | 41 ++++++++++++++++++++++---------- 6 files changed, 73 insertions(+), 29 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b1e50cc4bf..b5aa69321c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,13 @@ +2001-06-20 12:30 UTC-0400 David G. Holm + + * source\rtl\gtapi.c + * source\rtl\setpos.c + * Updated from the old Harbour Exception to the new Harbour Exception + with permission from Bil Simser . + + * source\rtl\gtwin\gtwin.c + + Added comment about Beep() parameters ignored on non-NT platforms. + 2001-06-20 09:55 GMT+3 Alexander Kresin * source/debug/debugger.prg * added code to support PgDn, PgUp in a code window and a vars window diff --git a/harbour/doc/en/license.txt b/harbour/doc/en/license.txt index 2ea6e0ba58..8ba5f7127c 100644 --- a/harbour/doc/en/license.txt +++ b/harbour/doc/en/license.txt @@ -87,8 +87,6 @@ * contrib\libmisc\dates2.c (Only the DateTime() function by Jon Berg) * samples\pe\* * source\rtl\philes.c - * source\rtl\gtapi.c - * source\rtl\setpos.c * source\rtl\binnum.c * source\lang\msgsr852.c * source\lang\msgpl852.c diff --git a/harbour/doc/license.txt b/harbour/doc/license.txt index 7f02841746..ef824ec420 100644 --- a/harbour/doc/license.txt +++ b/harbour/doc/license.txt @@ -78,8 +78,6 @@ contrib\libmisc\dates2.c (Only the DateTime() function by Jon Berg) samples\pe\license.txt source\rtl\philes.c - source\rtl\gtapi.c - source\rtl\setpos.c source\rtl\binnum.c source\lang\msgsr852.c source\lang\msgpl852.c diff --git a/harbour/source/rtl/gtapi.c b/harbour/source/rtl/gtapi.c index 7c8aea0ccf..bad81ec5da 100644 --- a/harbour/source/rtl/gtapi.c +++ b/harbour/source/rtl/gtapi.c @@ -11,15 +11,8 @@ * * 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 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) with other files to produce - * an executable, this does not by itself cause the resulting executable - * to be covered by the GNU General Public License. Your use of that - * executable is in no way restricted on account of linking the HRL - * and/or HVM code into it. + * 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 @@ -27,9 +20,33 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * 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 + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. * */ diff --git a/harbour/source/rtl/gtwin/gtwin.c b/harbour/source/rtl/gtwin/gtwin.c index a9a9a9780f..78e8a772ec 100644 --- a/harbour/source/rtl/gtwin/gtwin.c +++ b/harbour/source/rtl/gtwin/gtwin.c @@ -1170,9 +1170,13 @@ void hb_gt_Tone( double dFrequency, double dDuration ) dDuration = dDuration * 1000.0 / 18.2; /* milliseconds */ dDuration = HB_MIN( HB_MAX( 0, dDuration ), ULONG_MAX ); - if( dDuration > 0.0 ) + if( dDuration > 0.0 ) { + /* Bad news for non-NT Windows platforms: Beep() ignores + both parameters and either generates the default sound + event or the standard system beep. */ Beep( ( ULONG ) HB_MIN( HB_MAX( 0.0, dFrequency ), 32767.0 ), ( ULONG ) dDuration ); + } } char * hb_gt_Version( void ) diff --git a/harbour/source/rtl/setpos.c b/harbour/source/rtl/setpos.c index a6c829ea86..466dfa26c7 100644 --- a/harbour/source/rtl/setpos.c +++ b/harbour/source/rtl/setpos.c @@ -11,15 +11,8 @@ * * 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 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) with other files to produce - * an executable, this does not by itself cause the resulting executable - * to be covered by the GNU General Public License. Your use of that - * executable is in no way restricted on account of linking the HRL - * and/or HVM code into it. + * 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 @@ -27,9 +20,33 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * 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 + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. * */