fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2006-06-23 02:50 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/source/rtl/gtgui/Makefile
  * harbour/source/rtl/gtgui/gtgui.c
    * hacked GTGUI for W32 to be compiled using the same name as RTL default
      GT driver (GTWIN).

  * harbour/include/hbgtcore.h
  * harbour/source/rtl/hbgtcore.c
    * changed 'char *' to 'const char *' in hb_gtSetDefault(), hb_gtLoad()
This commit is contained in:
Przemyslaw Czerpak
2006-06-23 01:00:15 +00:00
parent 086eb547da
commit 2a3c796c2b
5 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -9,6 +9,16 @@
*/
2006-06-25 08:32 UTC+0300 Chen Kedem <niki@actcom.co.il>
* TODO
* Change one assignment from Przemek to Ryszard
2006-06-23 02:50 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/rtl/gtgui/Makefile
* harbour/source/rtl/gtgui/gtgui.c
* hacked GTGUI for W32 to be compiled using the same name as RTL default
GT driver (GTWIN).
* harbour/include/hbgtcore.h
* harbour/source/rtl/hbgtcore.c
* changed 'char *' to 'const char *' in hb_gtSetDefault(), hb_gtLoad()

4
harbour/include/hbgtcore.h
View File

@@ -508,9 +508,9 @@ extern void hb_gt_WhoCares( void * pCargo );
#define HB_GTSUPER_GFXTEXT(t,l,s,c,h,w) (HB_GTSUPER)->GfxPrimitive(t,l,s,c,h,w)
#define HB_GTSUPER_WHOCARES(p) (HB_GTSUPER)->WhoCares(p)
extern HB_EXPORT void hb_gtSetDefault( char * szGtName );
extern HB_EXPORT void hb_gtSetDefault( const char * szGtName );
extern HB_EXPORT BOOL hb_gtRegister( PHB_GT_INIT gtInit );
extern HB_EXPORT BOOL hb_gtLoad( char * szGtName, PHB_GT_FUNCS pFuncTable );
extern HB_EXPORT BOOL hb_gtLoad( const char * szGtName, PHB_GT_FUNCS pFuncTable );
extern HB_EXPORT BOOL hb_gtUnLoad( void );
extern HB_EXPORT void hb_gtStartupInit( void );

7
harbour/source/rtl/gtgui/Makefile
View File

@@ -10,3 +10,10 @@ C_SOURCES=\
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

25
harbour/source/rtl/gtgui/gtgui.c
View File

@@ -54,9 +54,32 @@
/* NOTE: User programs should never call this layer directly! */
#define HB_GT_NAME GUI
#define HB_OS_WIN_32_USED
#include "hbapi.h"
/*
* This GT should be called GUI but we introduce a hack to make
* Windows users happy ;-) and we will change its name to the
* one used by default GT REQUESTed by our RTL library, [druzus]
*/
#if defined( HB_OS_WIN_32 )
#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
#else
#define HB_GT_NAME GUI
#endif
#include "hbgtcore.h"
#include "hbinit.h"

6
harbour/source/rtl/hbgtcore.c
View File

@@ -2725,7 +2725,7 @@ static char * hb_gtFindDefault( void )
return NULL;
}
static int hb_gtFindEntry( char * pszID )
static int hb_gtFindEntry( const char * pszID )
{
int iPos;
@@ -2740,7 +2740,7 @@ static int hb_gtFindEntry( char * pszID )
return -1;
}
HB_EXPORT void hb_gtSetDefault( char * szGtName )
HB_EXPORT void hb_gtSetDefault( const char * szGtName )
{
hb_strncpy( s_gtNameBuf, szGtName, HB_GT_NAME_MAX_ );
s_defaultGT = s_gtNameBuf;
@@ -2756,7 +2756,7 @@ HB_EXPORT BOOL hb_gtRegister( PHB_GT_INIT gtInit )
return FALSE;
}
HB_EXPORT BOOL hb_gtLoad( char * szGtName, PHB_GT_FUNCS pFuncTable )
HB_EXPORT BOOL hb_gtLoad( const char * szGtName, PHB_GT_FUNCS pFuncTable )
{
int iPos;