From 5e538976bfe80e82077f4afee13ae4a1ff09e148 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 19 Aug 2007 03:16:52 +0000 Subject: [PATCH] 2007-08-19 05:14 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * source/rtl/tget.prg ! Fixed bug where mask was missing for date var type when no explicit picture was used. * contrib/libct/makefile.bc ! Added missing lines. --- harbour/ChangeLog | 8 ++++++++ harbour/contrib/libct/makefile.bc | 19 +++++++++++++++++++ harbour/source/rtl/tget.prg | 1 + 3 files changed, 28 insertions(+) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9761ae3cd1..175709d788 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-08-19 05:14 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * source/rtl/tget.prg + ! Fixed bug where mask was missing for date var type when + no explicit picture was used. + + * contrib/libct/makefile.bc + ! Added missing lines. + 2007-08-14 15:22 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/cdpapi.c + added HB_UTF8TRAN(), HB_UTF8STUFF(), HB_UTF8POKE() diff --git a/harbour/contrib/libct/makefile.bc b/harbour/contrib/libct/makefile.bc index 54b0511514..861d59f98f 100644 --- a/harbour/contrib/libct/makefile.bc +++ b/harbour/contrib/libct/makefile.bc @@ -292,6 +292,10 @@ $(OBJ_DIR)\ctmath2.obj : $(TOOLS_DIR)\ctmath2.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, +$(OBJ_DIR)\ctnet.obj : $(TOOLS_DIR)\ctnet.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + $(OBJ_DIR)\ctset.obj : $(TOOLS_DIR)\ctset.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, @@ -300,6 +304,10 @@ $(OBJ_DIR)\ctstr.obj : $(TOOLS_DIR)\ctstr.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, +$(OBJ_DIR)\ctstrfil.obj : $(TOOLS_DIR)\ctstrfil.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + $(OBJ_DIR)\ctchksum.obj : $(TOOLS_DIR)\ctchksum.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, @@ -340,6 +348,10 @@ $(OBJ_DIR)\dbftools.obj : $(TOOLS_DIR)\dbftools.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, +$(OBJ_DIR)\disk.obj : $(TOOLS_DIR)\disk.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + $(OBJ_DIR)\expand.obj : $(TOOLS_DIR)\expand.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, @@ -492,6 +504,13 @@ $(OBJ_DIR)\wordtoch.obj : $(TOOLS_DIR)\wordtoch.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, +$(OBJ_DIR)\blank.c : $(TOOLS_DIR)\blank.prg + $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ + +$(OBJ_DIR)\blank.obj : $(OBJ_DIR)\blank.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + $(OBJ_DIR)\ct.c : $(TOOLS_DIR)\ct.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ diff --git a/harbour/source/rtl/tget.prg b/harbour/source/rtl/tget.prg index d76f611114..d7b49cbe38 100644 --- a/harbour/source/rtl/tget.prg +++ b/harbour/source/rtl/tget.prg @@ -217,6 +217,7 @@ METHOD New( nRow, nCol, bVarBlock, cVarName, cPicture, cColorSpec ) CLASS Get DEFAULT nCol TO Col() DEFAULT cVarName TO "" DEFAULT bVarBlock TO iif( ISCHARACTER( cVarName ), MemvarBlock( cVarName ), NIL ) + DEFAULT cPicture TO "" DEFAULT cColorSpec TO hb_ColorIndex( SetColor(), CLR_UNSELECTED ) + "," + hb_ColorIndex( SetColor(), CLR_ENHANCED ) ::nRow := nRow