From 0ebb791450ced57def22989a34fc4db715300312 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 10 Nov 2007 23:48:48 +0000 Subject: [PATCH] 2007-11-11 00:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * include/std.ch * Removed HB_EXTENSION guard from around SET commands implementing Harbour _SET_* extensions. The reason: _SET_* extensions are not marked as extensions (and it would be nearly impossibly to do so), so it's more consistent to behave the same way for their command counterparts. * utils/hbpp/hbpplib.c ! Removed HB_EXTENSION guard from around __PP*() functions which are Harbour undocumented ones, so they don't need to be guarded. We're also in sync with hbextern.ch now. * utils/hbtest/rt_stra.prg ! Removed HB_EXTENSION guard from around hb_ValToStr() calls, because this function is no longer marked as HB_EXTENSION. * contrib/hgf/os2pm/tmenu.prg * contrib/hgf/os2pm/tmenuitm.prg * contrib/hgf/gtk/shared.ch * contrib/hgf/gtk/dispatch.c * contrib/hgf/gtk/creamenu.c * contrib/hgf/gtk/msginfo.c * contrib/hgf/gtk/creabutt.c * contrib/hgf/gtk/general.c * contrib/hgf/gtk/creawin.c * contrib/hgf/gtk/harbgtk.h * contrib/hgf/gtk/menuitem.prg * contrib/hgf/win32/button.prg * contrib/hgf/win32/edit.prg * contrib/hgf/win32/form.prg * contrib/hgf/win32/menu.prg * contrib/hgf/win32/menuitem.prg * contrib/hgf/win32/winctrl.prg * contrib/hgf/tests/bld_b32.bat * contrib/hgf/tests/form2.prg * contrib/hgf/tests/form3.prg * contrib/hgf/tests/form3.hbf * contrib/hgf/tests/form3res.prg * contrib/hgf/tests/formtext.prg * contrib/hgf/tests/testctrl.prg * contrib/hgf/tests/testform.prg ! Fixed bld_b32.bat to link properly. ! Changed HBMenuItem CLASS to HGFMenuItem() to not collide with Harbour class HBMenuItem() (C53 compatibility class). ; The above reported by Petr Chornyj. ! Added CRLF at the end of each source file where there was none. ! Fixed version headers. ; TOFIX1: HBPersistent():LoadFromFile() has a bug where it doesn't load the last line if it doesn't end with newline. ; TOFIX2: HBPersistent() uses At() "dirty" extension. * contrib/odbc/test/odbcdemo.prg - contrib/odbc/test/browodbc.prg * contrib/odbc/test/odbccall.prg * contrib/odbc/test/testodbc.prg * contrib/odbc/common.mak + contrib/odbc/browodbc.prg ! Moved back browodbc.prg to /contrib/odbc (since it was not a test, just missing from the non-GNU make files) Reported by Petr Chornyj. ! Added browodbc.prg to non-GNU makefile. ! Added version headers. --- harbour/ChangeLog | 70 ++++++++++++++++++-- harbour/contrib/hgf/gtk/creabutt.c | 2 +- harbour/contrib/hgf/gtk/creamenu.c | 2 +- harbour/contrib/hgf/gtk/creawin.c | 2 +- harbour/contrib/hgf/gtk/dispatch.c | 2 +- harbour/contrib/hgf/gtk/general.c | 2 +- harbour/contrib/hgf/gtk/harbgtk.h | 2 +- harbour/contrib/hgf/gtk/menuitem.prg | 10 +-- harbour/contrib/hgf/gtk/msginfo.c | 2 +- harbour/contrib/hgf/gtk/shared.ch | 2 +- harbour/contrib/hgf/os2pm/tmenu.prg | 2 - harbour/contrib/hgf/os2pm/tmenuitm.prg | 13 ++-- harbour/contrib/hgf/tests/bld_b32.bat | 46 +++++++------ harbour/contrib/hgf/tests/form2.prg | 6 +- harbour/contrib/hgf/tests/form3.hbf | 2 +- harbour/contrib/hgf/tests/form3.prg | 2 +- harbour/contrib/hgf/tests/form3res.prg | 2 +- harbour/contrib/hgf/tests/formtext.prg | 6 +- harbour/contrib/hgf/tests/testctrl.prg | 2 +- harbour/contrib/hgf/tests/testform.prg | 16 ++--- harbour/contrib/hgf/win32/button.prg | 2 +- harbour/contrib/hgf/win32/edit.prg | 2 +- harbour/contrib/hgf/win32/form.prg | 2 +- harbour/contrib/hgf/win32/menu.prg | 2 +- harbour/contrib/hgf/win32/menuitem.prg | 12 ++-- harbour/contrib/hgf/win32/winctrl.prg | 2 +- harbour/contrib/odbc/{test => }/browodbc.prg | 0 harbour/contrib/odbc/common.mak | 1 + harbour/contrib/odbc/test/odbccall.prg | 4 ++ harbour/contrib/odbc/test/odbcdemo.prg | 3 + harbour/contrib/odbc/test/testodbc.prg | 4 ++ harbour/include/std.ch | 23 +++---- harbour/utils/hbpp/hbpplib.c | 8 --- harbour/utils/hbtest/rt_stra.prg | 23 +++---- 34 files changed, 170 insertions(+), 111 deletions(-) rename harbour/contrib/odbc/{test => }/browodbc.prg (100%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 20e2e57fc1..a6cb87ff35 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,71 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-11-11 00:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * include/std.ch + * Removed HB_EXTENSION guard from around SET commands + implementing Harbour _SET_* extensions. The reason: + _SET_* extensions are not marked as extensions (and + it would be nearly impossibly to do so), so it's more + consistent to behave the same way for their command + counterparts. + + * utils/hbpp/hbpplib.c + ! Removed HB_EXTENSION guard from around __PP*() functions + which are Harbour undocumented ones, so they don't need to + be guarded. We're also in sync with hbextern.ch now. + + * utils/hbtest/rt_stra.prg + ! Removed HB_EXTENSION guard from around hb_ValToStr() calls, + because this function is no longer marked as HB_EXTENSION. + + * contrib/hgf/os2pm/tmenu.prg + * contrib/hgf/os2pm/tmenuitm.prg + * contrib/hgf/gtk/shared.ch + * contrib/hgf/gtk/dispatch.c + * contrib/hgf/gtk/creamenu.c + * contrib/hgf/gtk/msginfo.c + * contrib/hgf/gtk/creabutt.c + * contrib/hgf/gtk/general.c + * contrib/hgf/gtk/creawin.c + * contrib/hgf/gtk/harbgtk.h + * contrib/hgf/gtk/menuitem.prg + * contrib/hgf/win32/button.prg + * contrib/hgf/win32/edit.prg + * contrib/hgf/win32/form.prg + * contrib/hgf/win32/menu.prg + * contrib/hgf/win32/menuitem.prg + * contrib/hgf/win32/winctrl.prg + * contrib/hgf/tests/bld_b32.bat + * contrib/hgf/tests/form2.prg + * contrib/hgf/tests/form3.prg + * contrib/hgf/tests/form3.hbf + * contrib/hgf/tests/form3res.prg + * contrib/hgf/tests/formtext.prg + * contrib/hgf/tests/testctrl.prg + * contrib/hgf/tests/testform.prg + ! Fixed bld_b32.bat to link properly. + ! Changed HBMenuItem CLASS to HGFMenuItem() to not collide with + Harbour class HBMenuItem() (C53 compatibility class). + ; The above reported by Petr Chornyj. + ! Added CRLF at the end of each source file where there was none. + ! Fixed version headers. + ; TOFIX1: HBPersistent():LoadFromFile() has a bug where it doesn't + load the last line if it doesn't end with newline. + ; TOFIX2: HBPersistent() uses At() "dirty" extension. + + * contrib/odbc/test/odbcdemo.prg + - contrib/odbc/test/browodbc.prg + * contrib/odbc/test/odbccall.prg + * contrib/odbc/test/testodbc.prg + * contrib/odbc/common.mak + + contrib/odbc/browodbc.prg + ! Moved back browodbc.prg to /contrib/odbc (since it was not a test, + just missing from the non-GNU make files) + Reported by Petr Chornyj. + ! Added browodbc.prg to non-GNU makefile. + ! Added version headers. + 2007-11-10 18:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * Makefile - samples @@ -304,7 +369,7 @@ 2007-11-09 15:20 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * source/compiler/hbcomp.c - ! Changed error messaged to go to stderr on non-Unix + ! Changed error messages to go to stderr on non-Unix platforms too. With this change the Harbour compiler uses the same output on non-Unix platforms as on Unixes. With Przemek's previous and now this change, the @@ -327,9 +392,6 @@ * contrib/libct/ctstrfil.c ! Fixed MSVC warnings. - * contrib/libct/make_b32.bat - * contrib/libct/make_vc.bat - * contrib/htmllib/Makefile.bc * Changed to not generate .ppo output on build. diff --git a/harbour/contrib/hgf/gtk/creabutt.c b/harbour/contrib/hgf/gtk/creabutt.c index 2c0c583b85..ae5a7d7f97 100644 --- a/harbour/contrib/hgf/gtk/creabutt.c +++ b/harbour/contrib/hgf/gtk/creabutt.c @@ -1,5 +1,5 @@ /* - * $"Id"$ + * $Id$ */ /* diff --git a/harbour/contrib/hgf/gtk/creamenu.c b/harbour/contrib/hgf/gtk/creamenu.c index f19bccb094..63665b7074 100644 --- a/harbour/contrib/hgf/gtk/creamenu.c +++ b/harbour/contrib/hgf/gtk/creamenu.c @@ -1,5 +1,5 @@ /* - * $"Id"$ + * $Id$ */ /* diff --git a/harbour/contrib/hgf/gtk/creawin.c b/harbour/contrib/hgf/gtk/creawin.c index 57b824f483..008ecf7748 100644 --- a/harbour/contrib/hgf/gtk/creawin.c +++ b/harbour/contrib/hgf/gtk/creawin.c @@ -1,5 +1,5 @@ /* - * $"Id"$ + * $Id$ */ /* diff --git a/harbour/contrib/hgf/gtk/dispatch.c b/harbour/contrib/hgf/gtk/dispatch.c index a7ca1d1d80..040b5fad67 100644 --- a/harbour/contrib/hgf/gtk/dispatch.c +++ b/harbour/contrib/hgf/gtk/dispatch.c @@ -1,5 +1,5 @@ /* - * $"Id"$ + * $Id$ */ /* diff --git a/harbour/contrib/hgf/gtk/general.c b/harbour/contrib/hgf/gtk/general.c index fe457cd9b8..bbaf2cfae4 100644 --- a/harbour/contrib/hgf/gtk/general.c +++ b/harbour/contrib/hgf/gtk/general.c @@ -1,5 +1,5 @@ /* - * $"Id"$ + * $Id$ */ /* diff --git a/harbour/contrib/hgf/gtk/harbgtk.h b/harbour/contrib/hgf/gtk/harbgtk.h index 42a66992cd..c61e19375c 100644 --- a/harbour/contrib/hgf/gtk/harbgtk.h +++ b/harbour/contrib/hgf/gtk/harbgtk.h @@ -1,5 +1,5 @@ /* - * $"Id"$ + * $Id$ */ /* diff --git a/harbour/contrib/hgf/gtk/menuitem.prg b/harbour/contrib/hgf/gtk/menuitem.prg index 263cdfae80..1eca0b8b23 100644 --- a/harbour/contrib/hgf/gtk/menuitem.prg +++ b/harbour/contrib/hgf/gtk/menuitem.prg @@ -5,7 +5,7 @@ /* * Harbour Project source code: * Harbour GUI framework for Gtk - * Class HBMenuItem + * Class HGFMenuItem * * Copyright 2001 Antonio Linares * www - http://www.harbour-project.org @@ -61,7 +61,7 @@ /* ********************************************************************* */ -CLASS HBMenuItem FROM HBPersistent +CLASS HGFMenuItem FROM HBPersistent DATA Caption INIT "" PROPERTY // Specifies the text of the menu item DATA Name PROPERTY // The name of this component @@ -86,7 +86,7 @@ ENDCLASS /* ********************************************************************* */ -METHOD New( oOwner ) CLASS HBMenuItem +METHOD New( oOwner ) CLASS HGFMenuItem ::nId := ::nIdStart++ IF oOwner != nil @@ -99,7 +99,7 @@ RETURN Self /* ********************************************************************* */ -METHOD Add( oMenuItem ) CLASS HBMenuItem +METHOD Add( oMenuItem ) CLASS HGFMenuItem /* required because of a stupid Harbour compiler error */ LOCAL nHandle := ::nHandle @@ -115,7 +115,7 @@ RETURN nil /* ********************************************************************* */ -METHOD FindItem( nId ) CLASS HBMenuItem +METHOD FindItem( nId ) CLASS HGFMenuItem LOCAL oMenuItem, n FOR n = 1 TO Len( ::Items ) diff --git a/harbour/contrib/hgf/gtk/msginfo.c b/harbour/contrib/hgf/gtk/msginfo.c index 5a7650c43b..acdbf7b15b 100644 --- a/harbour/contrib/hgf/gtk/msginfo.c +++ b/harbour/contrib/hgf/gtk/msginfo.c @@ -1,5 +1,5 @@ /* - * $"Id"$ + * $Id$ */ /* diff --git a/harbour/contrib/hgf/gtk/shared.ch b/harbour/contrib/hgf/gtk/shared.ch index 10b43edbc2..a05842cfb2 100644 --- a/harbour/contrib/hgf/gtk/shared.ch +++ b/harbour/contrib/hgf/gtk/shared.ch @@ -1,5 +1,5 @@ /* - * $"Id"$ + * $Id$ */ /* diff --git a/harbour/contrib/hgf/os2pm/tmenu.prg b/harbour/contrib/hgf/os2pm/tmenu.prg index f4a1347ff9..e53c5f663e 100644 --- a/harbour/contrib/hgf/os2pm/tmenu.prg +++ b/harbour/contrib/hgf/os2pm/tmenu.prg @@ -107,5 +107,3 @@ METHOD FindItem( nId ) CLASS HBMenu next return oMenuItem - - diff --git a/harbour/contrib/hgf/os2pm/tmenuitm.prg b/harbour/contrib/hgf/os2pm/tmenuitm.prg index aca158c323..bfc4e982d4 100644 --- a/harbour/contrib/hgf/os2pm/tmenuitm.prg +++ b/harbour/contrib/hgf/os2pm/tmenuitm.prg @@ -2,7 +2,6 @@ * $Id$ */ - /* * Harbour Project source code: * Harbour GUI framework for IBM OS/2 Presentation Manager @@ -58,8 +57,7 @@ #include "os2pm.ch" - -CLASS HBMenuItem FROM HBPersistent +CLASS HGFMenuItem FROM HBPersistent DATA Caption PROPERTY // Specifies the text of the menu item DATA Name PROPERTY // The name of this component @@ -80,7 +78,7 @@ CLASS HBMenuItem FROM HBPersistent ENDCLASS -METHOD New( oOwner ) CLASS HBMenuItem +METHOD New( oOwner ) CLASS HGFMenuItem DEFAULT ::nIdStart TO 110 @@ -93,7 +91,7 @@ METHOD New( oOwner ) CLASS HBMenuItem return Self -METHOD Add( oMenuItem ) CLASS HBMenuItem +METHOD Add( oMenuItem ) CLASS HGFMenuItem DEFAULT ::Items TO {} @@ -111,7 +109,7 @@ METHOD Add( oMenuItem ) CLASS HBMenuItem return nil -METHOD FindItem( nId ) CLASS HBMenuItem +METHOD FindItem( nId ) CLASS HGFMenuItem local oMenuItem, n @@ -128,6 +126,3 @@ METHOD FindItem( nId ) CLASS HBMenuItem next return oMenuItem - - - diff --git a/harbour/contrib/hgf/tests/bld_b32.bat b/harbour/contrib/hgf/tests/bld_b32.bat index 38a3550374..b792bad916 100644 --- a/harbour/contrib/hgf/tests/bld_b32.bat +++ b/harbour/contrib/hgf/tests/bld_b32.bat @@ -1,25 +1,25 @@ -@rem -@rem $Id$ -@rem +@echo off +rem +rem $Id$ +rem -@ECHO OFF CLS -if A%1 == A GOTO :SINTAX +if A%1 == A GOTO :SYNTAX if NOT EXIST %1.prg GOTO :NOEXIST ECHO Compiling... set hdir=..\..\.. -set bcdir=c:\bcc55\bin +set bcdir=C:\bcc55\bin -%hdir%\bin\harbour %1 /n /p /i..\include;%hdir%\include %2 %3 > comp.log -@type comp.log +%hdir%\bin\harbour %1 /n /p /i..\include;%hdir%\include %2 %3 > bld_b32.log +type bld_b32.log IF ERRORLEVEL 1 PAUSE IF ERRORLEVEL 1 GOTO EXIT echo -O2 -e%1.exe -I%hdir%\include %1.c > b32.bc -%bcdir%\bcc32 -M -c @b32.bc +%BCDIR%\bcc32 -M -c @b32.bc :ENDCOMPILE echo c0w32.obj + > b32.bc @@ -37,28 +37,30 @@ echo %hdir%\lib\dbfcdx.lib + >> b32.bc echo %hdir%\lib\debug.lib + >> b32.bc echo %hdir%\lib\common.lib + >> b32.bc echo %hdir%\lib\pp.lib + >> b32.bc +echo %hdir%\lib\hbsix.lib + >> b32.bc +echo %hdir%\lib\dbffpt.lib + >> b32.bc echo %hdir%\lib\hgfwin32.lib + >> b32.bc rem Uncomment these two lines to use Advantage RDD rem echo %hdir%\lib\rddads.lib + >> b32.bc rem echo %hdir%\lib\ace32.lib + >> b32.bc -echo %bcdir%\lib\cw32.lib + >> b32.bc -echo %bcdir%\lib\import32.lib, >> b32.bc +echo %BCDIR%\lib\cw32.lib + >> b32.bc +echo %BCDIR%\lib\import32.lib, >> b32.bc ECHO * ECHO Linking... rem Use these flags to avoid the console window creation -rem %bcdir%\ilink32 -Gn -aa -Tpe -s @b32.bc -%bcdir%\ilink32 -Gn -Tpe -s @b32.bc +rem %BCDIR%\ilink32 -Gn -aa -Tpe -s @b32.bc +%BCDIR%\ilink32 -Gn -Tpe -s @b32.bc rem delete temporary files -@del %1.c -@del b32.bc -@del comp.log -@del %1.map -@del %1.obj -@del %1.tds +del %1.c +del b32.bc +del bld_b32.log +del %1.map +del %1.obj +del %1.tds IF ERRORLEVEL 1 GOTO LINKERROR ECHO * Application successfully built @@ -71,11 +73,11 @@ rem if exist meminfo.txt notepad meminfo.txt rem PAUSE * Linking errors * GOTO EXIT -:SINTAX -ECHO SYNTAX: Build [Program] {-- Don't specify .PRG extension +:SYNTAX +ECHO SYNTAX: Build [Program] {-- Don't specify .prg extension GOTO EXIT :NOEXIST ECHO The specified PRG %1 does not exist -:EXIT \ No newline at end of file +:EXIT diff --git a/harbour/contrib/hgf/tests/form2.prg b/harbour/contrib/hgf/tests/form2.prg index b08585123d..c3cdcdc22a 100644 --- a/harbour/contrib/hgf/tests/form2.prg +++ b/harbour/contrib/hgf/tests/form2.prg @@ -32,13 +32,13 @@ METHOD New() CLASS HBForm2 oMenu = HBMenu():New( Self ) - oMenuItem = HBMenuItem():New( oMenu ) + oMenuItem = HGFMenuItem():New( oMenu ) oMenuitem:Caption = "Test" oMenuitem:Name = "Test" oMenuItem:OnClick = "TestClick" // The container method to execute oMenu:Add( oMenuItem ) - oMenuItem = HBMenuItem():New( oMenu ) + oMenuItem = HGFMenuItem():New( oMenu ) oMenuitem:Caption = "Exit" oMenuitem:Name = "Exit" oMenuItem:OnClick = "ExitClick" // The container method to execute @@ -53,4 +53,4 @@ METHOD TestClick( oSender ) CLASS HBForm2 MsgInfo( "This event has been fired by a " + oSender:ClassName() + " object",; "Welcome to Harbour GUI power" ) -return nil \ No newline at end of file +return nil diff --git a/harbour/contrib/hgf/tests/form3.hbf b/harbour/contrib/hgf/tests/form3.hbf index 7cfc0f9119..96e3af0150 100644 --- a/harbour/contrib/hgf/tests/form3.hbf +++ b/harbour/contrib/hgf/tests/form3.hbf @@ -7,4 +7,4 @@ OBJECT oForm3 AS HBForm3 ::Height = 250 ::OnClick = "FormClick" -ENDOBJECT \ No newline at end of file +ENDOBJECT diff --git a/harbour/contrib/hgf/tests/form3.prg b/harbour/contrib/hgf/tests/form3.prg index 7ce467547a..58bad9a58b 100644 --- a/harbour/contrib/hgf/tests/form3.prg +++ b/harbour/contrib/hgf/tests/form3.prg @@ -28,4 +28,4 @@ METHOD New() CLASS HBForm3 #include "form3.hbf" // Notice this is just a persistence ascii file // renamed as .hbf = Harbour form -return Self \ No newline at end of file +return Self diff --git a/harbour/contrib/hgf/tests/form3res.prg b/harbour/contrib/hgf/tests/form3res.prg index 3d5f91c835..a0b1e543b0 100644 --- a/harbour/contrib/hgf/tests/form3res.prg +++ b/harbour/contrib/hgf/tests/form3res.prg @@ -19,4 +19,4 @@ CLASS HBForm3 FROM HBForm METHOD FormClick( oSender, nX, nY ) INLINE MsgInfo( "Click" ) -ENDCLASS \ No newline at end of file +ENDCLASS diff --git a/harbour/contrib/hgf/tests/formtext.prg b/harbour/contrib/hgf/tests/formtext.prg index fc372e7a87..4da44bb267 100644 --- a/harbour/contrib/hgf/tests/formtext.prg +++ b/harbour/contrib/hgf/tests/formtext.prg @@ -36,13 +36,13 @@ METHOD New() CLASS HBForm2 oMenu = HBMenu():New( Self ) - oMenuItem = HBMenuItem():New( oMenu ) + oMenuItem = HGFMenuItem():New( oMenu ) oMenuitem:Caption = "View as Text" oMenuitem:Name = "ViewAsText" oMenuItem:OnClick = "ViewAsTextClick" // The container method to execute oMenu:Add( oMenuItem ) - oMenuItem = HBMenuItem():New( oMenu ) + oMenuItem = HGFMenuItem():New( oMenu ) oMenuitem:Caption = "Exit" oMenuitem:Name = "Exit" oMenuItem:OnClick = "ExitClick" // The container method to execute @@ -57,4 +57,4 @@ METHOD Form2Click( oSender, nXPos, nYPos ) CLASS HBForm2 MsgInfo( "Click at " + AllTrim( Str( nXPos ) ) + ", " + ; AllTrim( Str( nYPos ) ) ) -return nil \ No newline at end of file +return nil diff --git a/harbour/contrib/hgf/tests/testctrl.prg b/harbour/contrib/hgf/tests/testctrl.prg index 86fb5a29cc..3a613ca87c 100644 --- a/harbour/contrib/hgf/tests/testctrl.prg +++ b/harbour/contrib/hgf/tests/testctrl.prg @@ -55,4 +55,4 @@ CLASS HBFormControls FROM HBForm METHOD BtnOkClick( oSender ) INLINE MsgInfo( "Ok was pressed" ) METHOD BtnCancelClick( oSender ) INLINE MsgInfo( "Cancel was pressed" ) -ENDCLASS \ No newline at end of file +ENDCLASS diff --git a/harbour/contrib/hgf/tests/testform.prg b/harbour/contrib/hgf/tests/testform.prg index 8090dc1f8b..fdee93a89f 100644 --- a/harbour/contrib/hgf/tests/testform.prg +++ b/harbour/contrib/hgf/tests/testform.prg @@ -10,31 +10,31 @@ function Main() local oMenu := HBMenu():New( oForm ) local oMenuItem, oSubItem, oSubItem2 - oMenuItem = HBMenuItem():New( oMenu ) + oMenuItem = HGFMenuItem():New( oMenu ) oMenuItem:Caption = "One" oMenu:Add( oMenuItem ) - oSubItem = HBMenuItem():New( oMenuItem ) + oSubItem = HGFMenuItem():New( oMenuItem ) oSubItem:Caption = "First" oMenuItem:Add( oSubItem ) - oSubItem = HBMenuItem():New( oMenuItem ) + oSubItem = HGFMenuItem():New( oMenuItem ) oSubItem:Caption = "Second" oMenuItem:Add( oSubItem ) - oSubItem2 = HBMenuItem():New( oSubItem ) + oSubItem2 = HGFMenuItem():New( oSubItem ) oSubItem2:Caption = "Some" oSubItem:Add( oSubItem2 ) - oSubItem2 = HBMenuItem():New( oSubItem ) + oSubItem2 = HGFMenuItem():New( oSubItem ) oSubItem2:Caption = "More" oSubItem:Add( oSubItem2 ) - oMenuItem = HBMenuItem():New( oMenu ) + oMenuItem = HGFMenuItem():New( oMenu ) oMenuItem:Caption = "Two" oMenu:Add( oMenuItem ) - oMenuItem = HBMenuItem():New( oMenu ) + oMenuItem = HGFMenuItem():New( oMenu ) oMenuItem:Caption = "Three" oMenu:Add( oMenuItem ) @@ -44,4 +44,4 @@ function Main() oForm:ShowModal() -return nil \ No newline at end of file +return nil diff --git a/harbour/contrib/hgf/win32/button.prg b/harbour/contrib/hgf/win32/button.prg index a8378c7c4f..5cf9dc4c80 100644 --- a/harbour/contrib/hgf/win32/button.prg +++ b/harbour/contrib/hgf/win32/button.prg @@ -70,4 +70,4 @@ METHOD New( oContainer ) CLASS HBButton ::Width = 80 ::Height = 25 -return Self \ No newline at end of file +return Self diff --git a/harbour/contrib/hgf/win32/edit.prg b/harbour/contrib/hgf/win32/edit.prg index 41dfdeea0c..369981b71c 100644 --- a/harbour/contrib/hgf/win32/edit.prg +++ b/harbour/contrib/hgf/win32/edit.prg @@ -68,4 +68,4 @@ METHOD New( oContainer ) CLASS HBEdit ::Width = 121 ::Height = 21 -return Self \ No newline at end of file +return Self diff --git a/harbour/contrib/hgf/win32/form.prg b/harbour/contrib/hgf/win32/form.prg index ae4c7eee3c..c53d77da30 100644 --- a/harbour/contrib/hgf/win32/form.prg +++ b/harbour/contrib/hgf/win32/form.prg @@ -181,4 +181,4 @@ function HB_GUI( hWnd, nMsg, nParam1, nParam2 ) // messages entry point aReturn[ 1 ] = aForms[ nForm ]:HandleEvent( nMsg, nParam1, nParam2 ) endif -return aReturn \ No newline at end of file +return aReturn diff --git a/harbour/contrib/hgf/win32/menu.prg b/harbour/contrib/hgf/win32/menu.prg index 5cfdddc7a0..4ca5940dd2 100644 --- a/harbour/contrib/hgf/win32/menu.prg +++ b/harbour/contrib/hgf/win32/menu.prg @@ -101,4 +101,4 @@ METHOD FindItem( nId ) CLASS HBMenu endif next -return oMenuItem \ No newline at end of file +return oMenuItem diff --git a/harbour/contrib/hgf/win32/menuitem.prg b/harbour/contrib/hgf/win32/menuitem.prg index b4d0ef9f23..a675887aa0 100644 --- a/harbour/contrib/hgf/win32/menuitem.prg +++ b/harbour/contrib/hgf/win32/menuitem.prg @@ -5,7 +5,7 @@ /* * Harbour Project source code: * Harbour GUI framework for Win32 - * Class HBMenuItem + * Class HGFMenuItem * * Copyright 2001 Antonio Linares * www - http://www.harbour-project.org @@ -54,7 +54,7 @@ #include "common.ch" #include "hbclass.ch" -CLASS HBMenuItem FROM HBPersistent +CLASS HGFMenuItem FROM HBPersistent DATA Caption PROPERTY // Specifies the text of the menu item DATA Name PROPERTY // The name of this component @@ -74,7 +74,7 @@ CLASS HBMenuItem FROM HBPersistent ENDCLASS -METHOD New( oOwner ) CLASS HBMenuItem +METHOD New( oOwner ) CLASS HGFMenuItem DEFAULT ::nIdStart TO 110 @@ -85,7 +85,7 @@ METHOD New( oOwner ) CLASS HBMenuItem return Self -METHOD Add( oMenuItem ) CLASS HBMenuItem +METHOD Add( oMenuItem ) CLASS HGFMenuItem DEFAULT ::Items TO {} DEFAULT ::nHandle TO WinCreateSubMenu( ::oParent:nHandle, ::nId ) @@ -98,7 +98,7 @@ METHOD Add( oMenuItem ) CLASS HBMenuItem return nil -METHOD FindItem( nId ) CLASS HBMenuItem +METHOD FindItem( nId ) CLASS HGFMenuItem local oMenuItem, n @@ -114,4 +114,4 @@ METHOD FindItem( nId ) CLASS HBMenuItem endif next -return oMenuItem \ No newline at end of file +return oMenuItem diff --git a/harbour/contrib/hgf/win32/winctrl.prg b/harbour/contrib/hgf/win32/winctrl.prg index 1fef3bcddd..42fa563962 100644 --- a/harbour/contrib/hgf/win32/winctrl.prg +++ b/harbour/contrib/hgf/win32/winctrl.prg @@ -85,4 +85,4 @@ CLASS HBWinControl FROM HBPersistent METHOD Show() INLINE ShowWindow( ::hWnd, SW_SHOWNA ) -ENDCLASS \ No newline at end of file +ENDCLASS diff --git a/harbour/contrib/odbc/test/browodbc.prg b/harbour/contrib/odbc/browodbc.prg similarity index 100% rename from harbour/contrib/odbc/test/browodbc.prg rename to harbour/contrib/odbc/browodbc.prg diff --git a/harbour/contrib/odbc/common.mak b/harbour/contrib/odbc/common.mak index b0dd33b903..a4ec9e4547 100644 --- a/harbour/contrib/odbc/common.mak +++ b/harbour/contrib/odbc/common.mak @@ -13,6 +13,7 @@ LIB_PATH = $(LIB_DIR)\$(LIBNAME)$(LIBEXT) LIB_OBJS = \ $(OBJ_DIR)\odbc$(OBJEXT) \ $(OBJ_DIR)\todbc$(OBJEXT) \ + $(OBJ_DIR)\browodbc$(OBJEXT) \ all: \ $(LIB_PATH) \ diff --git a/harbour/contrib/odbc/test/odbccall.prg b/harbour/contrib/odbc/test/odbccall.prg index a277e896c7..354fdf87a0 100644 --- a/harbour/contrib/odbc/test/odbccall.prg +++ b/harbour/contrib/odbc/test/odbccall.prg @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + #xcommand WITH DO => Self := #xcommand ENDWITH => Self := NIL diff --git a/harbour/contrib/odbc/test/odbcdemo.prg b/harbour/contrib/odbc/test/odbcdemo.prg index cff9ca3840..0d7b59ea37 100644 --- a/harbour/contrib/odbc/test/odbcdemo.prg +++ b/harbour/contrib/odbc/test/odbcdemo.prg @@ -1,3 +1,6 @@ +/* + * $Id$ + */ *+-------------------------------------------------------------------- *+ diff --git a/harbour/contrib/odbc/test/testodbc.prg b/harbour/contrib/odbc/test/testodbc.prg index 40aca80178..3fae498691 100644 --- a/harbour/contrib/odbc/test/testodbc.prg +++ b/harbour/contrib/odbc/test/testodbc.prg @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + #include "sql.ch" #xcommand GET ROW INTO => ; diff --git a/harbour/include/std.ch b/harbour/include/std.ch index 4b223e8419..9630dd94f9 100644 --- a/harbour/include/std.ch +++ b/harbour/include/std.ch @@ -667,17 +667,16 @@ #endif /* HB_COMPAT_C53 */ -#ifdef HB_EXTENSION - #command SET FILECASE <(x)> => Set( _SET_FILECASE, <(x)> ) - #command SET FILECASE () => Set( _SET_FILECASE, ) - #command SET DIRCASE <(x)> => Set( _SET_DIRCASE, <(x)> ) - #command SET DIRCASE () => Set( _SET_DIRCASE, ) - #command SET DIRSEPARATOR => Set( _SET_DIRSEPARATOR, ) - #command SET DBFLOCKSCHEME TO => Set( _SET_DBFLOCKSCHEME, ) - #command SET DBFLOCKSCHEME TO => Set( _SET_DBFLOCKSCHEME, 0 ) - #command SET HARDCOMMIT => Set( _SET_HARDCOMMIT, <(x)> ) - #command SET HARDCOMMIT () => Set( _SET_HARDCOMMIT, ) - #command SET EOL => Set( _SET_EOL, ) -#endif +/* Harbour extensions */ +#command SET FILECASE <(x)> => Set( _SET_FILECASE, <(x)> ) +#command SET FILECASE () => Set( _SET_FILECASE, ) +#command SET DIRCASE <(x)> => Set( _SET_DIRCASE, <(x)> ) +#command SET DIRCASE () => Set( _SET_DIRCASE, ) +#command SET DIRSEPARATOR => Set( _SET_DIRSEPARATOR, ) +#command SET DBFLOCKSCHEME TO => Set( _SET_DBFLOCKSCHEME, ) +#command SET DBFLOCKSCHEME TO => Set( _SET_DBFLOCKSCHEME, 0 ) +#command SET HARDCOMMIT => Set( _SET_HARDCOMMIT, <(x)> ) +#command SET HARDCOMMIT () => Set( _SET_HARDCOMMIT, ) +#command SET EOL => Set( _SET_EOL, ) #endif /* HB_STD_CH_ */ diff --git a/harbour/utils/hbpp/hbpplib.c b/harbour/utils/hbpp/hbpplib.c index f0f07cf9d5..2a3580bd72 100644 --- a/harbour/utils/hbpp/hbpplib.c +++ b/harbour/utils/hbpp/hbpplib.c @@ -60,15 +60,12 @@ #endif #include -/* #include */ #include "hbppdef.h" #include "hbcomp.h" #include "hbapi.h" #include "hbapierr.h" -#ifdef HB_EXTENSION - HB_PATHNAMES * hb_comp_pIncludePath = NULL; PHB_FNAME hb_comp_pFileName = NULL; FILES hb_comp_files; @@ -92,8 +89,6 @@ BOOL hb_comp_bDebugInfo = FALSE; /* holds if generate d int hb_comp_iExitLevel = HB_EXITLEVEL_DEFAULT; /* holds if there was any warning during the compilation process */ FILE * hb_comp_yyppo = NULL; -/* static jmp_buf s_env; */ - HB_FUNC( __PP_INIT ) { hb_pp_Table(); @@ -251,6 +246,3 @@ void hb_compGenWarning( HB_COMP_DECL, char * szWarnings[], char cPrefix, int iWa HB_SYMBOL_UNUSED( szWarning1 ); HB_SYMBOL_UNUSED( szWarning2 ); } - -#endif - diff --git a/harbour/utils/hbtest/rt_stra.prg b/harbour/utils/hbtest/rt_stra.prg index dd2d7863e8..3f12a96637 100644 --- a/harbour/utils/hbtest/rt_stra.prg +++ b/harbour/utils/hbtest/rt_stra.prg @@ -473,31 +473,30 @@ FUNCTION Exact_Str() TEST_LINE( "DEF" >= "ABCD", .T. ) SET( _SET_EXACT, old_exact ) + RETURN NIL FUNCTION New_STRINGS() #ifdef __HARBOUR__ -#ifdef HB_EXTENSION - TEST_LINE( HB_ValToStr( 4 ) , " 4" ) - TEST_LINE( HB_ValToStr( 4.0 / 2 ) , " 2.00" ) - TEST_LINE( HB_ValToStr( "String" ) , "String" ) - TEST_LINE( HB_ValToStr( HB_SToD( "20010101" ) ) , "2001.01.01" ) - TEST_LINE( HB_ValToStr( NIL ) , "NIL" ) - TEST_LINE( HB_ValToStr( .F. ) , ".F." ) - TEST_LINE( HB_ValToStr( .T. ) , ".T." ) + TEST_LINE( hb_ValToStr( 4 ) , " 4" ) + TEST_LINE( hb_ValToStr( 4.0 / 2 ) , " 2.00" ) + TEST_LINE( hb_ValToStr( "String" ) , "String" ) + TEST_LINE( hb_ValToStr( hb_SToD( "20010101" ) ) , "2001.01.01" ) + TEST_LINE( hb_ValToStr( NIL ) , "NIL" ) + TEST_LINE( hb_ValToStr( .F. ) , ".F." ) + TEST_LINE( hb_ValToStr( .T. ) , ".T." ) -#endif #endif RETURN NIL FUNCTION Long_STRINGS() - TEST_LINE( RIGHT( SPACE( 64 * 1024 - 5 ) + "12345 7890", 10 ), "12345 7890" ) - TEST_LINE( LEN( SPACE( 81910 ) + "1234567890" ), 81920 ) - TEST_LINE( ( "1234567890" + SPACE( 810910 ) ) - ( "1234567890" + SPACE( 810910 ) ), "12345678901234567890" + SPACE( 810910 * 2 ) ) + TEST_LINE( Right( Space( 64 * 1024 - 5 ) + "12345 7890", 10 ), "12345 7890" ) + TEST_LINE( Len( Space( 81910 ) + "1234567890" ), 81920 ) + TEST_LINE( ( "1234567890" + Space( 810910 ) ) - ( "1234567890" + Space( 810910 ) ), "12345678901234567890" + Space( 810910 * 2 ) ) RETURN NIL