From a1eb99932d7eac47a3c59c39284dfb3724b045dd Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 27 Jun 2008 01:51:45 +0000 Subject: [PATCH] 2008-06-27 03:27 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/gtwvg/Makefile * contrib/gtwvg/common.mak - contrib/gtwvg/wvtclass.prg + contrib/gtwvg/wvgclass.prg - contrib/gtwvg/wvtpaint.prg + contrib/gtwvg/wvgpaint.prg - contrib/gtwvg/wvtcore.c + contrib/gtwvg/wvgcore.c - contrib/gtwvg/wvtutils.c + contrib/gtwvg/wvgutils.c * contrib/gtwvg/hbgtwvg.ch * contrib/gtwvg/wvtwin.ch + Added self-guards for headers. ! Added missing SVN header and copyright to hbgtwvg.ch. ! Deleted ISBLOCK() from wvtwin.ch since it's already #defined in common.ch. * Renamed local source files from wvt*.* -> wvg*.* --- harbour/ChangeLog | 19 ++++++ harbour/contrib/gtwvg/Makefile | 8 +-- harbour/contrib/gtwvg/common.mak | 8 +-- harbour/contrib/gtwvg/hbgtwvg.ch | 64 ++++++++++++++++--- .../gtwvg/{wvtclass.prg => wvgclass.prg} | 0 .../contrib/gtwvg/{wvtcore.c => wvgcore.c} | 0 .../gtwvg/{wvtpaint.prg => wvgpaint.prg} | 0 .../contrib/gtwvg/{wvtutils.c => wvgutils.c} | 0 harbour/contrib/gtwvg/wvtwin.ch | 8 ++- 9 files changed, 89 insertions(+), 18 deletions(-) rename harbour/contrib/gtwvg/{wvtclass.prg => wvgclass.prg} (100%) rename harbour/contrib/gtwvg/{wvtcore.c => wvgcore.c} (100%) rename harbour/contrib/gtwvg/{wvtpaint.prg => wvgpaint.prg} (100%) rename harbour/contrib/gtwvg/{wvtutils.c => wvgutils.c} (100%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 357c7cc86b..95856d5dc1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,25 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-06-27 03:27 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/gtwvg/Makefile + * contrib/gtwvg/common.mak + - contrib/gtwvg/wvtclass.prg + + contrib/gtwvg/wvgclass.prg + - contrib/gtwvg/wvtpaint.prg + + contrib/gtwvg/wvgpaint.prg + - contrib/gtwvg/wvtcore.c + + contrib/gtwvg/wvgcore.c + - contrib/gtwvg/wvtutils.c + + contrib/gtwvg/wvgutils.c + * contrib/gtwvg/hbgtwvg.ch + * contrib/gtwvg/wvtwin.ch + + Added self-guards for headers. + ! Added missing SVN header and copyright to hbgtwvg.ch. + ! Deleted ISBLOCK() from wvtwin.ch since it's already + #defined in common.ch. + * Renamed local source files from wvt*.* -> wvg*.* + 2008-06-26 15:58 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/pp/hbpp.c ! Fixed typo in recent modification. diff --git a/harbour/contrib/gtwvg/Makefile b/harbour/contrib/gtwvg/Makefile index e382ad27bb..b2222ad542 100644 --- a/harbour/contrib/gtwvg/Makefile +++ b/harbour/contrib/gtwvg/Makefile @@ -8,15 +8,15 @@ ROOT = ../../ C_SOURCES=\ gtwvg.c \ - wvtcore.c \ - wvtutils.c \ + wvgcore.c \ + wvgutils.c \ C_HEADERS=\ gtwvg.h \ PRG_SOURCES=\ - wvtclass.prg \ - wvtpaint.prg \ + wvgclass.prg \ + wvgpaint.prg \ PRG_HEADERS=\ hbgtwvg.ch \ diff --git a/harbour/contrib/gtwvg/common.mak b/harbour/contrib/gtwvg/common.mak index 258b99d63d..9fd950603c 100644 --- a/harbour/contrib/gtwvg/common.mak +++ b/harbour/contrib/gtwvg/common.mak @@ -14,12 +14,12 @@ PRG_HEADERS=\ wvtwin.ch \ LIB_OBJS = \ - $(OBJ_DIR)wvtclass$(OBJEXT) \ - $(OBJ_DIR)wvtpaint$(OBJEXT) \ + $(OBJ_DIR)wvgclass$(OBJEXT) \ + $(OBJ_DIR)wvgpaint$(OBJEXT) \ \ $(OBJ_DIR)gtwvg$(OBJEXT) \ - $(OBJ_DIR)wvtcore$(OBJEXT) \ - $(OBJ_DIR)wvtutils$(OBJEXT) \ + $(OBJ_DIR)wvgcore$(OBJEXT) \ + $(OBJ_DIR)wvgutils$(OBJEXT) \ all: \ $(LIB_PATH) \ diff --git a/harbour/contrib/gtwvg/hbgtwvg.ch b/harbour/contrib/gtwvg/hbgtwvg.ch index ca952464a1..102238e38a 100644 --- a/harbour/contrib/gtwvg/hbgtwvg.ch +++ b/harbour/contrib/gtwvg/hbgtwvg.ch @@ -1,13 +1,60 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Header file for the WVG*Classes + * + * Copyright 2004 Pritpal Bedi + * www - http://www.xharbour.org http://www.harbour-project.org + * + * 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) + * 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 + * 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. 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. + * + */ + +#ifndef _HBGTWVG_CH +#define _HBGTWVG_CH + //----------------------------------------------------------------------// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// -// // Extended GT Manipulation Constants -// -// Pritpal Bedi -// -//----------------------------------------------------------------------// -//----------------------------------------------------------------------// //----------------------------------------------------------------------// #define HB_GTI_SETFONT 71 @@ -37,3 +84,4 @@ //----------------------------------------------------------------------// +#endif diff --git a/harbour/contrib/gtwvg/wvtclass.prg b/harbour/contrib/gtwvg/wvgclass.prg similarity index 100% rename from harbour/contrib/gtwvg/wvtclass.prg rename to harbour/contrib/gtwvg/wvgclass.prg diff --git a/harbour/contrib/gtwvg/wvtcore.c b/harbour/contrib/gtwvg/wvgcore.c similarity index 100% rename from harbour/contrib/gtwvg/wvtcore.c rename to harbour/contrib/gtwvg/wvgcore.c diff --git a/harbour/contrib/gtwvg/wvtpaint.prg b/harbour/contrib/gtwvg/wvgpaint.prg similarity index 100% rename from harbour/contrib/gtwvg/wvtpaint.prg rename to harbour/contrib/gtwvg/wvgpaint.prg diff --git a/harbour/contrib/gtwvg/wvtutils.c b/harbour/contrib/gtwvg/wvgutils.c similarity index 100% rename from harbour/contrib/gtwvg/wvtutils.c rename to harbour/contrib/gtwvg/wvgutils.c diff --git a/harbour/contrib/gtwvg/wvtwin.ch b/harbour/contrib/gtwvg/wvtwin.ch index 08aa6a0aeb..c84ec6861a 100644 --- a/harbour/contrib/gtwvg/wvtwin.ch +++ b/harbour/contrib/gtwvg/wvtwin.ch @@ -49,6 +49,10 @@ * If you do not wish that, delete this exception notice. * */ + +#ifndef _WVGWIN_CH +#define _WVGWIN_CH + //-------------------------------------------------------------------// // // GTWVT Specific @@ -192,8 +196,6 @@ //-------------------------------------------------------------------// -#define ISBLOCK( x ) valtype( x ) == 'B' - #define RGB( nR,nG,nB ) ( nR + ( nG * 256 ) + ( nB * 256 * 256 ) ) //-------------------------------------------------------------------// @@ -1233,3 +1235,5 @@ #define OFN_FORCESHOWHIDDEN 268435456 // Show All files including System and hidden files //----------------------------------------------------------------------// + +#endif