diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3d47fe505a..fcaa60d312 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,16 @@ past entries belonging to these authors: Viktor Szakats. */ +2009-05-14 02:28 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * include/hbextern.ch + * source/rtl/Makefile + + source/rtl/tgethb.prg + * source/rtl/tget.prg + + HB_EXTENSION functionality (:hideInput() and :style()) moved + from GET to a new derived class called HB_GET(). It means + this functionality is available in default builds. + Further extensions can be added to this class. + 2009-05-14 02:00 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * include/hbextern.ch * contrib/xhb/hbcompat.ch diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index c7d78412c5..1922dbf962 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -857,6 +857,7 @@ EXTERNAL HB_ISSTRING EXTERNAL HB_ISSYMBOL EXTERNAL HB_ISDATETIME EXTERNAL HB_ISTIMESTAMP +EXTERNAL HB_GET EXTERNAL HB_DATETIME EXTERNAL HB_CTOD diff --git a/harbour/source/rtl/Makefile b/harbour/source/rtl/Makefile index 654fb5feae..d4c3f394a9 100644 --- a/harbour/source/rtl/Makefile +++ b/harbour/source/rtl/Makefile @@ -220,6 +220,7 @@ PRG_SOURCES=\ teditor.prg \ text.prg \ tget.prg \ + tgethb.prg \ tgetint.prg \ tgetlist.prg \ tgetx.prg \ diff --git a/harbour/source/rtl/tget.prg b/harbour/source/rtl/tget.prg index b6d1274c7e..ff78d39052 100644 --- a/harbour/source/rtl/tget.prg +++ b/harbour/source/rtl/tget.prg @@ -178,17 +178,6 @@ CREATE CLASS GET METHOD exitState( xValue ) SETGET METHOD reader( xValue ) SETGET -#ifdef HB_EXTENSION - METHOD hideInput( lHideInput ) SETGET - METHOD style( cStyle ) SETGET -#endif - -#ifdef HB_COMPAT_XPP - MESSAGE _end() METHOD end() - MESSAGE _assign() METHOD assign() - MESSAGE _delete() METHOD delete() -#endif - PROTECTED: #ifndef HB_COMPAT_C53 @@ -1956,26 +1945,6 @@ METHOD Reader( xValue ) CLASS GET RETURN ::bReader -#ifdef HB_EXTENSION - -METHOD hideInput( lHideInput ) CLASS GET - - IF lHideInput != NIL - ::lHideInput := __eInstVar53( Self, "HIDEINPUT", lHideInput, "L", 1001 ) - ENDIF - - RETURN ::lHideInput - -METHOD style( cStyle ) CLASS GET - - IF cStyle != NIL - ::cStyle := __eInstVar53( Self, "STYLE", cStyle, "C", 1001, {|| Len( cStyle ) == 1 } ) - ENDIF - - RETURN ::cStyle - -#endif - /* ------------------------------------------------------------------------- */ METHOD New( nRow, nCol, bVarBlock, cVarName, cPicture, cColorSpec ) CLASS GET diff --git a/harbour/source/rtl/tgethb.prg b/harbour/source/rtl/tgethb.prg new file mode 100644 index 0000000000..2ab0d167a9 --- /dev/null +++ b/harbour/source/rtl/tgethb.prg @@ -0,0 +1,78 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Get Class (Harbour extended) + * + * Copyright 2009 Viktor Szakats + * 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. + * + */ + +#include "hbclass.ch" + +CREATE CLASS hb_Get INHERIT Get + + EXPORTED: + + METHOD hideInput( lHideInput ) SETGET + METHOD style( cStyle ) SETGET + +ENDCLASS + +METHOD hideInput( lHideInput ) CLASS hb_Get + + IF lHideInput != NIL + ::lHideInput := __eInstVar53( Self, "HIDEINPUT", lHideInput, "L", 1001 ) + ENDIF + + RETURN ::lHideInput + +METHOD style( cStyle ) CLASS hb_Get + + IF cStyle != NIL + ::cStyle := __eInstVar53( Self, "STYLE", cStyle, "C", 1001, {|| Len( cStyle ) == 1 } ) + ENDIF + + RETURN ::cStyle