diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bf4f61a975..834af219a9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,22 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-09-24 12:12 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * common.mak + * source/rtl/gtgui/Makefile + - source/rtl/gtgui/gtdef.c + - Removed HB_GTGUI_HACK to masquerade GTGUI under a different + name and to make Windows users happier. Instead of hacking + Windows users with GUI programs should simply use + this in their code: + -- + PROCEDURE HB_GTSYS + REQUEST HB_GT_GUI_DEFAULT + RETURN + -- + ; This clears up a few exceptions, make hacks and a few possible + confusions. + 2008-09-24 02:26 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * make_gcc.sh * make_gnu_os2.cmd diff --git a/harbour/common.mak b/harbour/common.mak index 771c143e5e..e593a9d6ad 100644 --- a/harbour/common.mak +++ b/harbour/common.mak @@ -1003,17 +1003,9 @@ GTWVT_LIB_OBJS = \ #********************************************************** -GTGUI_LIB_COMMON_OBJS = \ +GTGUI_LIB_OBJS = \ $(OBJ_DIR)\gtgui$(OBJEXT) \ -GTGUI_LIB_STATIC_OBJS = \ - $(OBJ_DIR)\gtdef$(OBJEXT) \ - -GTGUI_LIB_SHARED_OBJS = \ - -GTGUI_LIB_OBJS = $(GTGUI_LIB_COMMON_OBJS) $(GTGUI_LIB_STATIC_OBJS) -GTGUI_DLL_OBJS = $(GTGUI_LIB_COMMON_OBJS) $(GTGUI_LIB_SHARED_OBJS) - #********************************************************** GTOS2_LIB_OBJS = \ diff --git a/harbour/source/rtl/gtgui/Makefile b/harbour/source/rtl/gtgui/Makefile index 46378b0d45..08aa82e124 100644 --- a/harbour/source/rtl/gtgui/Makefile +++ b/harbour/source/rtl/gtgui/Makefile @@ -6,15 +6,7 @@ ROOT = ../../../ C_SOURCES=\ gtgui.c \ - gtdef.c \ LIBNAME=gtgui include $(TOP)$(ROOT)config/lib.cf - -ifneq ($(HB_GT_DEFAULT),) -CFLAGS += -DHB_GT_DEFAULT=$(HB_GT_DEFAULT:gt%=%) -endif -ifneq ($(HB_GT_LIB),) -CFLAGS += -DHB_GT_LIB=$(HB_GT_LIB:gt%=%) -endif diff --git a/harbour/source/rtl/gtgui/gtdef.c b/harbour/source/rtl/gtgui/gtdef.c deleted file mode 100644 index 1021916b89..0000000000 --- a/harbour/source/rtl/gtgui/gtdef.c +++ /dev/null @@ -1,109 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * Mini GT for GUI programs. - * Now it supports only low level TONE and CLIPBOARD code for W32 - * - * Copyright 2006 Przemyslaw Czerpak - * www - 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. - * - */ - - -/* NOTE: User programs should never call this layer directly! */ - - -#include "hbapi.h" - -/* - * This GT is called GUI but we introduce a hack to make - * Windows users happy ;-) and we will add aliased name equal - * to the default GT REQUESTed by our RTL library, [druzus] - */ - -#if defined( HB_OS_WIN_32 ) && defined( HB_GTGUI_HACK ) - -#if defined(HB_GT_DEFAULT) -# define HB_GT_NAME HB_GT_DEFAULT -#elif defined(HB_GT_LIB) -# define HB_GT_NAME HB_GT_LIB -#else -# define HB_GT_NAME WIN -#endif - -/* Small trick to check if the default GT is not already set to GUI */ -#define GUI 1 -#define gui 1 - -#if HB_GT_NAME + 1 == 1 - -#undef GUI -#undef gui - -#include "hbgtcore.h" -#include "hbinit.h" - -HB_GT_REQUEST( GUI ) -HB_GT_ANNOUNCE( HB_GT_NAME ) - -HB_CALL_ON_STARTUP_BEGIN( _hb_startup_gt_hack_ ) - hb_gtSetDefault( "GUI" ); -HB_CALL_ON_STARTUP_END( _hb_startup_gt_hack_ ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup _hb_startup_gt_hack_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto__hb_startup_gt_hack_ = _hb_startup_gt_hack_; - #pragma data_seg() -#endif - - -#endif - -#endif /* HB_OS_WIN_32 */