diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 12cd031246..85337a7491 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,28 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-02-25 11:08 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * include/hbextern.ch + ! Added __QUITCANCEL. + + * contrib/hbxpp/Makefile + + contrib/hbxpp/pvaluex.c + * contrib/hbfship/Makefile + + contrib/hbfship/pvalue.c + + Added function PVALUE() to both Xbase++ and FlagShip lib. + + * contrib/hbxpp/Makefile + * contrib/hbxpp/hbxpp.ch + * contrib/hbxpp/idlex.c + - contrib/hbxpp/sleepx.prg + * Renamed already existing XPP_SLEEP() to SLEEP(). + - Deleted translation from SLEEP() to XPP_SLEEP() hbxpp.ch. + - Deleted recently added .prg implementation of SLEEP(). + + * contrib/hbqt/qtgui/QWidget.cpp + * contrib/hbqt/qtcore/TQChar.prg + * Regenerated. + 2010-02-25 08:40 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/vm/hvm.c + added internal PRG function __QUITCANCEL() @@ -90,7 +112,7 @@ * contrib/hbqt/hbqt_hbslots.h + Added slots for QDockWidget(). - * contrib/hbqt/THbQtUI.prg + * contrib/hbqt/THbQtUI.prg ! Refined destructor. * contrib/hbide/hbide.prg @@ -103,9 +125,9 @@ * contrib/hbide/ideprojmanager.prg * contrib/hbide/idesaveload.prg * contrib/hbide/idethemes.prg - + + This commit is mainly uplifts and rationlizes the menus, - toolbars, and docking widgets plus a big consideration of + toolbars, and docking widgets plus a big consideration of parent child relationship is achieved. * Implemented: right-side toolbar which contains the toggle @@ -113,18 +135,18 @@ also in main-menu option. * Menu options are reworked and all actions pertaining to docking - widgets are removed from there. The same is applied to - top-toolbar also. All actions pertaining to block operations - are cornered at the left-side toolbar. Thus menus, toolbars are + widgets are removed from there. The same is applied to + top-toolbar also. All actions pertaining to block operations + are cornered at the left-side toolbar. Thus menus, toolbars are in perfect synchronization. - * Harbour-help is now loaded on demand. Only when help icon is + * Harbour-help is now loaded on demand. Only when help icon is toggled on the right-toolbar. * hbIDE icon is changed as I committed before. No one forwarded his opinions, so I assume it is appropriate image. - ; NOTE: This commit now presents hbIDE to the external world + ; NOTE: This commit now presents hbIDE to the external world with almost-profession look and feel, so we can spread the word. ; This commit is with heavy changes so regression is possible. @@ -150,7 +172,6 @@ * ENDTEXT -> #pragma __endtext (Thanks for the hint, Xavi) ->>>>>>> .r13984 2010-02-24 20:04 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/pp/ppcore.c * src/compiler/cmdcheck.c @@ -178,7 +199,7 @@ line 1 line 2 line 3 - ENDTEXT + #pragma __endtext --- ('+' operator will be optimized out by the compiler, so there won't be any performance drop.) diff --git a/harbour/contrib/hbfship/Makefile b/harbour/contrib/hbfship/Makefile index a4e6cf8a8b..2f85a7d0ce 100644 --- a/harbour/contrib/hbfship/Makefile +++ b/harbour/contrib/hbfship/Makefile @@ -9,6 +9,7 @@ include $(TOP)$(ROOT)config/global.mk LIBNAME := hbfship C_SOURCES := \ + pvalue.c \ secondfs.c \ strpeek.c \ diff --git a/harbour/contrib/hbxpp/sleepx.prg b/harbour/contrib/hbfship/pvalue.c similarity index 90% rename from harbour/contrib/hbxpp/sleepx.prg rename to harbour/contrib/hbfship/pvalue.c index 33b6191d8f..7c9715d929 100644 --- a/harbour/contrib/hbxpp/sleepx.prg +++ b/harbour/contrib/hbfship/pvalue.c @@ -4,9 +4,9 @@ /* * Harbour Project source code: - * xBase++ SLEEP() function + * PVALUE() function * - * Copyright 2010 Przemyslaw Czerpak + * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,10 +50,6 @@ * */ -#include "common.ch" +#include "hbapi.h" -FUNCTION Sleep( nTime ) - - hb_idleSleep( IIF( ISNUMBER( nTime ), nTime / 100, 0 ) ) - - RETURN NIL +HB_FUNC_EXTERN( HB_PVALUE ); HB_FUNC( PVALUE ) { HB_FUNC_EXEC( HB_PVALUE ); } diff --git a/harbour/contrib/hbqt/qtcore/TQChar.prg b/harbour/contrib/hbqt/qtcore/TQChar.prg index 8fdc535b76..68145db859 100644 --- a/harbour/contrib/hbqt/qtcore/TQChar.prg +++ b/harbour/contrib/hbqt/qtcore/TQChar.prg @@ -1,5 +1,5 @@ /* - * $Id: hbqtgen.prg 13683 2010-01-23 11:20:21Z vszakats $ + * $Id: hbqtgen.prg 13958 2010-02-22 13:45:07Z vszakats $ */ /* -------------------------------------------------------------------- */ diff --git a/harbour/contrib/hbqt/qtgui/QWidget.cpp b/harbour/contrib/hbqt/qtgui/QWidget.cpp index 3bffb00e76..a1fdfa3b07 100644 --- a/harbour/contrib/hbqt/qtgui/QWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QWidget.cpp @@ -59,7 +59,6 @@ */ /*----------------------------------------------------------------------*/ -#include "hbapi.h" #include "../hbqt.h" /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbxpp/Makefile b/harbour/contrib/hbxpp/Makefile index bb9f65dde0..d6699780c4 100644 --- a/harbour/contrib/hbxpp/Makefile +++ b/harbour/contrib/hbxpp/Makefile @@ -17,6 +17,7 @@ C_SOURCES := \ mousex.c \ oemansix.c \ philesx.c \ + pvalue.c \ PRG_SOURCES := \ browdbx.prg \ @@ -28,7 +29,6 @@ PRG_SOURCES := \ dbtotalx.prg \ dbupdatx.prg \ runshell.prg \ - sleepx.prg \ tbcolumx.prg \ tbrowsex.prg \ tgetx.prg \ diff --git a/harbour/contrib/hbxpp/hbxpp.ch b/harbour/contrib/hbxpp/hbxpp.ch index 7a3b7ae45e..ba5f758968 100644 --- a/harbour/contrib/hbxpp/hbxpp.ch +++ b/harbour/contrib/hbxpp/hbxpp.ch @@ -65,7 +65,6 @@ #xtranslate IsPrinter([]) => hb_IsPrinter() #xtranslate DispOutAt() => hb_DispOutAt() -#xtranslate Sleep() => xpp_Sleep() #xtranslate AAdd(,,

) => hb_AIns(,,

,.T.) #xtranslate TBColumn() => xpp_TBColumn() diff --git a/harbour/contrib/hbxpp/idlex.c b/harbour/contrib/hbxpp/idlex.c index 5bf893227f..71547709b9 100644 --- a/harbour/contrib/hbxpp/idlex.c +++ b/harbour/contrib/hbxpp/idlex.c @@ -52,10 +52,10 @@ #include "hbapi.h" -/* NOTE: Not using the original name SLEEP() as it collides with - other implementations with the same name (FlagsShip, CLIP) - which also expects parameter differently. [vszakats] */ -HB_FUNC( XPP_SLEEP ) +/* NOTE: SLEEP() may collide with other implementations with the + same name (in FlagsShip, CLIP) which also expects parameter + differently. [vszakats] */ +HB_FUNC( SLEEP ) { hb_idleSleep( ( ( double ) hb_parnl( 1 ) ) / 100 ); } diff --git a/harbour/contrib/hbxpp/pvalue.c b/harbour/contrib/hbxpp/pvalue.c new file mode 100644 index 0000000000..7c9715d929 --- /dev/null +++ b/harbour/contrib/hbxpp/pvalue.c @@ -0,0 +1,55 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * PVALUE() function + * + * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) + * 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 "hbapi.h" + +HB_FUNC_EXTERN( HB_PVALUE ); HB_FUNC( PVALUE ) { HB_FUNC_EXEC( HB_PVALUE ); } diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index ea90519f43..54ea9996a4 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -453,6 +453,7 @@ EXTERNAL __XSAVESCREEN /* Harbour internal functions */ EXTERNAL __DBSKIPPER +EXTERNAL __QUITCANCEL EXTERNAL __NATISAFFIRM EXTERNAL __NATISNEGATIVE