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

2012-11-25 17:25 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* src/rdd/hbsix/sxcompat.prg
  * src/rtl/achoice.prg
  * src/rtl/browse.prg
  * src/rtl/dbedit.prg
  * contrib/xhb/xcstr.prg
  * contrib/xhb/xhberr.prg
    + use HB_MACROBLOCK() instead of & operator
      Review me.
    ; These remain in core:
        rtl/dbedit.prg:318:                                 &xUserFunc( nMode, oBrowse:colPos ), ;
        rtl/input.prg:59:   RETURN iif( Empty( cString ), NIL, &cString )
        rtl/tpersist.prg:102:               AAdd( aObjects, &( cLine ) )
        rtl/tpersist.prg:113:            &( cLine )
        rtl/tpersist.prg:125:            &( cLine )
        rtl/tpersist.prg:141:   LOCAL oNew := &( ::ClassName() + "()" ):CreateNew()

  * contrib/hbpgsql/tests/cache.prg
    + avoid some macro operators
    ! fixed a typo in recent modifications

  * contrib/hbnf/calendar.prg
  * contrib/hbnf/pchr.prg
  * contrib/hbnf/xbox.prg
    % SUBSTR( x, 1, y ) -> LEFT( x, y )

  * contrib/gtwvg/class.prg
  * contrib/gtwvg/paint.prg
  * contrib/hbct/fcopy.prg
  * contrib/hbct/tests/datetime.prg
  * contrib/hbct/tests/token2.prg
  * contrib/hbgd/tests/gdtestcl.prg
  * contrib/hbnf/metaph.prg
  * contrib/hbnf/popadder.prg
  * contrib/hbnf/tests/datecnfg.prg
  * contrib/hbnf/tests/popadder.prg
  * contrib/hbtip/sendmail.prg
  * contrib/hbtip/tests/base64.prg
  * contrib/hbtip/tests/tiptest.prg
  * contrib/hbwin/win_os.prg
  * contrib/hbwin/win_reg.prg
  * contrib/hbwin/win_tbmp.prg
  * contrib/hbwin/win_tprn.prg
  * contrib/xhb/htjlist.prg
  * contrib/xhb/xhbtedit.prg
  * contrib/xhb/xhw32prn.prg
    * avoid "&" in comments/outputs
This commit is contained in:
Viktor Szakats
2012-11-25 16:33:23 +00:00
parent 9fe99a603c
commit 00f37dbcdb
31 changed files with 119 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
harbour/ChangeLog
View File

@@ -10,6 +10,54 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2012-11-25 17:25 UTC+0100 Viktor Szakats (harbour syenar.net)
* src/rdd/hbsix/sxcompat.prg
* src/rtl/achoice.prg
* src/rtl/browse.prg
* src/rtl/dbedit.prg
* contrib/xhb/xcstr.prg
* contrib/xhb/xhberr.prg
+ use HB_MACROBLOCK() instead of & operator
Review me.
; These remain in core:
rtl/dbedit.prg:318: &xUserFunc( nMode, oBrowse:colPos ), ;
rtl/input.prg:59: RETURN iif( Empty( cString ), NIL, &cString )
rtl/tpersist.prg:102: AAdd( aObjects, &( cLine ) )
rtl/tpersist.prg:113: &( cLine )
rtl/tpersist.prg:125: &( cLine )
rtl/tpersist.prg:141: LOCAL oNew := &( ::ClassName() + "()" ):CreateNew()
* contrib/hbpgsql/tests/cache.prg
+ avoid some macro operators
! fixed a typo in recent modifications
* contrib/hbnf/calendar.prg
* contrib/hbnf/pchr.prg
* contrib/hbnf/xbox.prg
% SUBSTR( x, 1, y ) -> LEFT( x, y )
* contrib/gtwvg/class.prg
* contrib/gtwvg/paint.prg
* contrib/hbct/fcopy.prg
* contrib/hbct/tests/datetime.prg
* contrib/hbct/tests/token2.prg
* contrib/hbgd/tests/gdtestcl.prg
* contrib/hbnf/metaph.prg
* contrib/hbnf/popadder.prg
* contrib/hbnf/tests/datecnfg.prg
* contrib/hbnf/tests/popadder.prg
* contrib/hbtip/sendmail.prg
* contrib/hbtip/tests/base64.prg
* contrib/hbtip/tests/tiptest.prg
* contrib/hbwin/win_os.prg
* contrib/hbwin/win_reg.prg
* contrib/hbwin/win_tbmp.prg
* contrib/hbwin/win_tprn.prg
* contrib/xhb/htjlist.prg
* contrib/xhb/xhbtedit.prg
* contrib/xhb/xhw32prn.prg
* avoid "&" in comments/outputs
2012-11-25 16:40 UTC+0100 Viktor Szakats (harbour syenar.net)
* contrib/hbgt/*.c
* comment cleanup

2
harbour/contrib/gtwvg/class.prg
View File

@@ -11,7 +11,7 @@
*
* Video subsystem for Windows using GUI windows instead of Console
* Copyright 2003 Peter Rees <peter@rees.co.nz>
* Rees Software & Systems Ltd
* Rees Software and Systems Ltd
*
*
* This program is free software; you can redistribute it and/or modify

2
harbour/contrib/gtwvg/paint.prg
View File

@@ -280,7 +280,7 @@ FUNCTION Wvt_MakeDlgTemplate( nTop, nLeft, nRows, nCols, aOffSet, cTitle, nStyle
nX := aXY[ 1 ] + aOffSet[ 2 ]
nY := aXY[ 2 ] + aOffSet[ 1 ]
/* MSDN says DlgBaseUnits and Screen Coordinates has multiplier of 4,8 for x & Y.
/* MSDN says DlgBaseUnits and Screen Coordinates has multiplier of 4,8 for X and Y.
* But in my practice, the values below are 99% accurate.
* I have tested it on many fonts but on 1280/800 resolution.
* Please feel free to experiment if you find thses values inappropriate.

2
harbour/contrib/hbct/fcopy.prg
View File

@@ -11,7 +11,7 @@
* Dated....: Jun,17 94
* Revised..: Sep,20 94
* Purpose..: Replaces the following CA-T*ols functions which generate GPF's
* FileCopy(), FileCOpen() & FileAppend()!
* FileCopy(), FileCOpen(), FileAppend()!
* Relies on: Clipper (can you believe it!)
* Compile..: /n /m /w /[/p /b /l] /es2
* Notes....:

2
harbour/contrib/hbct/tests/datetime.prg
View File

@@ -4,7 +4,7 @@
/*
* Harbour Project source code:
* Program to test functions to mimic Clipper Tools III date & time functions.
* Program to test functions to mimic Clipper Tools III date and time functions.
* (C) Alan Secker 2002 <alansecker@globalnet.co.uk>
*
* small changes: Martin Vogel <vogel@inttec.de> 2003

2
harbour/contrib/hbct/tests/token2.prg
View File

@@ -118,7 +118,7 @@ PROCEDURE Main()
? ' rewind with TokenInit() == .T. ? ------> ' + LToC( TokenInit() )
? ' TokenEnd() ? -------------------------> ' + LToC( TokenEnd() )
WHILE ! TokenEnd()
? ' start & end with TokenAt(.F./.T.)-----> ' + Str( TokenAt() ) + ' ' + Str( TokenAt( .T. ) )
? ' start / end with TokenAt(.F./.T.)-----> ' + Str( TokenAt() ) + ' ' + Str( TokenAt( .T. ) )
TokenNext( @cStr1 )
? ' TokenEnd() ? -------------------------> ' + LToC( TokenEnd() )
ENDDO

2
harbour/contrib/hbgd/tests/gdtestcl.prg
View File

@@ -146,7 +146,7 @@ PROCEDURE Main()
? "end", Seconds() - nSecs
nSecs := Seconds()
? "start clone & zoom"
? "start clone and zoom"
oI2:Clone():Zoom( 200 )
? "end", Seconds() - nSecs

4
harbour/contrib/hbnf/calendar.prg
View File

@@ -104,9 +104,9 @@ FUNCTION ft_Calendar( nRow, nCol, cColor, lShadow, lShowHelp )
aRetVal[ 7 ] := JDOY( aRetVal[ 4 ], aRetVal[ 2 ], aRetVal[ 3 ] )
hb_DispOutAt( nRow, nCol, ;
SubStr( aRetval[ 6 ], 1, 3 ) + " " + ;
Left( aRetval[ 6 ], 3 ) + " " + ;
Str( aRetVal[ 3 ], 2, 0 ) + " " + ;
SubStr( aRetVal[ 5 ], 1, 3 ) + " " + ;
Left( aRetVal[ 5 ], 3 ) + " " + ;
Str( aRetVal[ 4 ], 4, 0 ) )
hb_DispOutAt( nRow + 1, nCol, ;

2
harbour/contrib/hbnf/metaph.prg
View File

@@ -99,7 +99,7 @@ FUNCTION ft_Metaph( cName, nSize ) // Calculates the metaphone of a character s
__defaultNIL( @nSize, 4 ) // default size: 4-bytes
// Remove non-alpha characters and make upper case.
// The string is padded with 1 space at the beginning & end.
// The string is padded with 1 space at the beginning and end.
// Spaces, if present inside the string, are not removed until all
// the prefix/suffix checking has been completed.
cMeta := " " + _ftMakeAlpha( Upper( AllTrim( cName ) ) ) + " "

8
harbour/contrib/hbnf/pchr.prg
View File

@@ -35,7 +35,7 @@ FUNCTION ft_PChr( c_nums )
LOCAL c_ret := "", c_st := 0, c_part, c_st2, c_hex := "0123456789ABCDEF"
LOCAL c_upper, c_t1, c_t2
IF SubStr( c_nums, 1, 1 ) == "," .OR. RTrim( c_nums ) == ""
IF Left( c_nums, 1 ) == "," .OR. RTrim( c_nums ) == ""
RETURN ""
ENDIF
@@ -44,12 +44,12 @@ FUNCTION ft_PChr( c_nums )
DO WHILE ! ( c_part == "~" .OR. c_part == "" )
IF SubStr( c_part, 1, 1 ) == '"'
IF Left( c_part, 1 ) == '"'
c_st2 := At( '"', SubStr( c_part, 2 ) ) + 1
c_ret := c_ret + SubStr( c_part, 2, c_st2 - 2 )
ELSEIF SubStr( c_part, 1, 1 ) == "&"
ELSEIF Left( c_part, 1 ) == "&"
c_upper := Upper( c_part )
c_t1 := At( SubStr( c_upper, 2, 1 ), c_hex ) - 1
@@ -67,7 +67,7 @@ FUNCTION ft_PChr( c_nums )
ELSE
IF SubStr( c_part, 1, 1 ) == "/"
IF Left( c_part, 1 ) == "/"
c_upper := Upper( c_part )

12
harbour/contrib/hbnf/popadder.prg
View File

@@ -59,7 +59,7 @@
// Instead of using STATIC variables for these I'm using a LOCAL array
// and passing aAdder[] all over the place.... Don't let this confuse
// you. I wrote the Adder using the variable names & now let the
// you. I wrote the Adder using the variable names and now let the
// PreProcessor do all the work.
#define nTotal aAdder[ 1 ]
#define nNumTotal aAdder[ 2 ]
@@ -138,7 +138,7 @@ FUNCTION ft_Adder()
lDecSet := .F. // Decimal ? - keyboard routine
lSubRtn := lTotalOk := lTape := lAddError := lDivError := .F.
nTopOS := Int( ( MaxRow() - 24 ) / 2 ) // Using the TopOffSet & LeftOffSet
nTopOS := Int( ( MaxRow() - 24 ) / 2 ) // Using the TopOffSet and LeftOffSet
nLeftOS := Int( ( MaxCol() - 79 ) / 2 ) // the Adder will always be centered
nAddSpace := iif( lShowRight, 40, 0 ) + nLeftOS
nTapeSpace := iif( lShowRight, 0, 40 ) + nLeftOS
@@ -150,11 +150,11 @@ FUNCTION ft_Adder()
_ftAddScreen( aAdder )
// Set the decimals to 2 & display a cleared adder
// Set the decimals to 2 and display a cleared adder
_ftChangeDec( aAdder, 2 )
hb_DispOutAt( 4 + nTopOS, 7 + nAddSpace, Transform( nTotal, cTotPict ) )
DO WHILE ! lDone // Input key & test loop
DO WHILE ! lDone // Input key and test loop
nKey := _ftInkey( 0, "nKey" )
DO CASE
CASE hb_keyChar( nKey ) $ "1234567890."
@@ -693,7 +693,7 @@ STATIC FUNCTION _ftUpdateTrans( aAdder, lTypeTotal, nAmount )
RETURN NIL
// ----------------------------------------------------------
// Clear the <TOTAL> & <SUBTOTAL> from Adder
// Clear the <TOTAL> and <SUBTOTAL> from Adder
STATIC FUNCTION _ftEraseTotSubTot( aAdder )
@@ -928,7 +928,7 @@ STATIC FUNCTION _ftQuest( cMessage, xVarVal, cPict, bValid, lNoESC, nWinColor, n
{| x | iif( PCount() > 0, xVarVal := x, xVarVal ) }, ;
"xVarVal" )
// If the input line is character & wider than window SCROLL
// If the input line is character and wider than window SCROLL
IF lGetOnNextLine .AND. HB_ISSTRING( xVarVal ) .AND. nVarLen > nWide
oNewGet:Picture := "@S" + hb_ntos( nWide ) + iif( cPict == NIL, "", " " + cPict )
ENDIF

2
harbour/contrib/hbnf/tests/datecnfg.prg
View File

@@ -56,7 +56,7 @@ PROCEDURE Main()
SET CENTURY ON
hb_langSelect( "EN" )
aTemp := ft_DateCnfg() // Get/Set cFY_Start & nDOW_Start.
aTemp := ft_DateCnfg() // Get/Set cFY_Start and nDOW_Start.
#if 0
aTemp := ft_DateCnfg( "1980.01.03", 1 ) // Date string in user's format.
#endif

2
harbour/contrib/hbnf/tests/popadder.prg
View File

@@ -26,7 +26,7 @@ PROCEDURE Main()
@ 15, 60 SAY "Vaca. hrs."
@ 23, 20 SAY "Press <ALT-A> to Pop - Up the Adder."
@ 24, 20 SAY "Press <ESC> to Quit the adder Demo."
DO WHILE .T. // Get the sick, personal, & vaca
DO WHILE .T. // Get the sick, personal, and vaca
@ 16, 24 GET nSickHrs PICTURE "9999.999" // Normally I have a VALID()
@ 16, 43 GET nPersHrs PICTURE "9999.999" // to make sure the value is
@ 16, 63 GET nVacaHrs PICTURE "9999.999" // within the allowable range.

16
harbour/contrib/hbnf/xbox.prg
View File

@@ -68,14 +68,14 @@ FUNCTION ft_XBox( cJustType, ; // "L" -> left, otherwise centered
nNumRows := Min( PCount() - 7, 8 )
// establish array of strings to be displayed
aLines_[ 1 ] := iif( HB_ISSTRING( cLine1 ), AllTrim( SubStr( cLine1, 1, 74 ) ), "" )
aLines_[ 2 ] := iif( HB_ISSTRING( cLine2 ), AllTrim( SubStr( cLine2, 1, 74 ) ), "" )
aLines_[ 3 ] := iif( HB_ISSTRING( cLine3 ), AllTrim( SubStr( cLine3, 1, 74 ) ), "" )
aLines_[ 4 ] := iif( HB_ISSTRING( cLine4 ), AllTrim( SubStr( cLine4, 1, 74 ) ), "" )
aLines_[ 5 ] := iif( HB_ISSTRING( cLine5 ), AllTrim( SubStr( cLine5, 1, 74 ) ), "" )
aLines_[ 6 ] := iif( HB_ISSTRING( cLine6 ), AllTrim( SubStr( cLine6, 1, 74 ) ), "" )
aLines_[ 7 ] := iif( HB_ISSTRING( cLine7 ), AllTrim( SubStr( cLine7, 1, 74 ) ), "" )
aLines_[ 8 ] := iif( HB_ISSTRING( cLine8 ), AllTrim( SubStr( cLine8, 1, 74 ) ), "" )
aLines_[ 1 ] := iif( HB_ISSTRING( cLine1 ), AllTrim( Left( cLine1, 74 ) ), "" )
aLines_[ 2 ] := iif( HB_ISSTRING( cLine2 ), AllTrim( Left( cLine2, 74 ) ), "" )
aLines_[ 3 ] := iif( HB_ISSTRING( cLine3 ), AllTrim( Left( cLine3, 74 ) ), "" )
aLines_[ 4 ] := iif( HB_ISSTRING( cLine4 ), AllTrim( Left( cLine4, 74 ) ), "" )
aLines_[ 5 ] := iif( HB_ISSTRING( cLine5 ), AllTrim( Left( cLine5, 74 ) ), "" )
aLines_[ 6 ] := iif( HB_ISSTRING( cLine6 ), AllTrim( Left( cLine6, 74 ) ), "" )
aLines_[ 7 ] := iif( HB_ISSTRING( cLine7 ), AllTrim( Left( cLine7, 74 ) ), "" )
aLines_[ 8 ] := iif( HB_ISSTRING( cLine8 ), AllTrim( Left( cLine8, 74 ) ), "" )
ASize( aLines_, Min( nNumRows, 8 ) )
// determine longest line

8
harbour/contrib/hbpgsql/tests/cache.prg
View File

@@ -166,7 +166,7 @@ PROCEDURE SQLCloseTemp( cAlias )
LOCAL x
IF ! Empty( Select( cAlias ) )
CLOSE &calias
( cAlias )->( dbCloseArea() )
ENDIF
x := AScan( s_aTableTemp, {| aVal | aVal[ DB_ALIAS ] == cAlias } )
@@ -323,7 +323,7 @@ FUNCTION SQLOpen( cAlias, cQuery, xFetch, cOrder )
dbUseArea( .T., NIL, cFile, cAlias, .F. )
ELSE
SELECT &cAlias
Select( cAlias )
ZAP
ENDIF
@@ -439,7 +439,7 @@ FUNCTION SQLPrepare( cQuery, ... )
IF x != NIL .AND. Empty( x )
x := "null"
ELSEIF HB_ISNUMBER( x )
ELSEIF HB_ISNUMERIC( x )
x := hb_ntos( x )
ELSEIF HB_ISDATE( x )
@@ -548,7 +548,7 @@ PROCEDURE MakeDBF( cAlias, aStructure, aIndex )
cKey := aIndex[ i ]
cIndex := TempFile()
INDEX ON &cKey TO &cIndex
INDEX ON &cKey TO ( cIndex )
AAdd( s_aTempDBF, cIndex )
NEXT

2
harbour/contrib/hbtip/sendmail.prg
View File

@@ -6,7 +6,7 @@
* Harbour Project source code:
* hb_SendMail() (This version of hb_SendMail() started from Luiz's original work on SendMail())
*
* Copyright 2007 Luiz Rafael Culik Guimaraes & Patrick Mast
* Copyright 2007 Luiz Rafael Culik Guimaraes and Patrick Mast
* Copyright 2009 Viktor Szakats (harbour syenar.net) (SSL support)
* www - http://www.xharbour.org
*

2
harbour/contrib/hbtip/tests/base64.prg
View File

@@ -69,7 +69,7 @@ PROCEDURE Main( ... )
? "base64test -d [<] encoded-file [>] file-to-decode"
? "base64test -q [-d] to use quoted printable encoding/decoding"
? "base64test -u [-d] to use url encoding/decoding."
? "input & output-redirection is optional"
? "input/output redirection is optional"
?
QUIT
ENDIF

2
harbour/contrib/hbtip/tests/tiptest.prg
View File

@@ -35,7 +35,7 @@
* headers) to RCPT e.f.
* stmp://user&at;myprovider.com@smtp.myprovider.com/gian@niccolai.ws
*
* NOTE: IN UNIX, to use & from command line you have to surround
* NOTE: In Unix, to use '&' from command line you have to surround
* the url with "", eg "smtp://...&at;...@server/dest"
*
* FTP Protocol

2
harbour/contrib/hbwin/win_os.prg
View File

@@ -6,7 +6,7 @@
* Harbour Project source code:
* Windows OS version information
*
* Copyright 2004 Peter Rees <peter@rees.co.nz> Rees Software & Systems Ltd
* Copyright 2004 Peter Rees <peter@rees.co.nz> Rees Software and Systems Ltd
* www - http://harbour-project.org
*
* This program is free software; you can redistribute it and/or modify

2
harbour/contrib/hbwin/win_reg.prg
View File

@@ -7,7 +7,7 @@
* Windows registry API
*
* Copyright 2008-2009 Viktor Szakats (harbour syenar.net)
* Copyright 2004 Peter Rees <peter@rees.co.nz> Rees Software & Systems Ltd
* Copyright 2004 Peter Rees <peter@rees.co.nz> Rees Software and Systems Ltd
* www - http://harbour-project.org
*
* This program is free software; you can redistribute it and/or modify

16
harbour/contrib/hbwin/win_tbmp.prg
View File

@@ -6,7 +6,7 @@
* Harbour Project source code:
* win_BMP() class
*
* Copyright 2004 Peter Rees <peter@rees.co.nz> Rees Software & Systems Ltd
* Copyright 2004 Peter Rees <peter@rees.co.nz> Rees Software and Systems Ltd
* www - http://harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
@@ -54,7 +54,7 @@
#include "hbwin.ch"
CREATE CLASS WIN_BMP
CREATE CLASS win_BMP
EXPORTED:
@@ -78,10 +78,10 @@ CREATE CLASS WIN_BMP
ENDCLASS
METHOD New() CLASS WIN_BMP
METHOD New() CLASS win_BMP
RETURN Self
METHOD LoadFile( cFileName, aDimXY ) CLASS WIN_BMP
METHOD LoadFile( cFileName, aDimXY ) CLASS win_BMP
::FileName := cFileName
::Bitmap := win_LoadBitmapFile( ::FileName )
@@ -99,16 +99,16 @@ METHOD LoadFile( cFileName, aDimXY ) CLASS WIN_BMP
RETURN ::Type != HB_WIN_BITMAP_UNKNOWN
METHOD Create() CLASS WIN_BMP // Compatibility function for Alaska Xbase++
METHOD Create() CLASS win_BMP // Compatibility function for Alaska Xbase++
RETURN Self
METHOD Destroy() CLASS WIN_BMP // Compatibility function for Alaska Xbase++
METHOD Destroy() CLASS win_BMP // Compatibility function for Alaska Xbase++
RETURN NIL
METHOD IsSupported( oPrn, /* @ */ nError ) CLASS WIN_BMP
METHOD IsSupported( oPrn, /* @ */ nError ) CLASS win_BMP
RETURN ( nError := win_bitmapIsSupported( oPrn:hPrinterDc, ::Bitmap ) ) == 0
METHOD Draw( oPrn, aRectangle, /* @ */ nError ) CLASS WIN_BMP // Pass a WIN_PRN object reference & Rectangle array
METHOD Draw( oPrn, aRectangle, /* @ */ nError ) CLASS win_BMP // Pass a win_Prn object reference and rectangle array
IF HB_ISARRAY( aRectangle )
::Rect := aRectangle

10
harbour/contrib/hbwin/win_tprn.prg
View File

@@ -6,7 +6,7 @@
* Harbour Project source code:
* Printing subsystem for Windows using GUI printing
*
* Copyright 2004 Peter Rees <peter@rees.co.nz> Rees Software & Systems Ltd
* Copyright 2004 Peter Rees <peter@rees.co.nz> Rees Software and Systems Ltd
* www - http://harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
@@ -52,7 +52,7 @@
/*
win_Prn() was designed to make it easy to emulate Clipper Dot Matrix printing.
Dot Matrix printing was in CPI ( Characters per inch & Lines per inch ).
Dot Matrix printing was in CPI ( Characters per inch and Lines per inch ).
Even though "Mapping Mode" for win_Prn() is WIN_MM_TEXT, ::SetFont() accepts the
xWidth parameter in CPI not Pixels. Also the default ::LineHeight is for
6 lines per inch so ::NewLine() works as per "LineFeed" on Dot Matrix printers.
@@ -76,7 +76,7 @@ CREATE CLASS win_Prn
METHOD New( cPrinter )
METHOD Create() // CreatesDC and sets "Courier New" font, set Orientation, Copies, Bin#
// Create() ( & StartDoc() ) must be called before printing can start.
// Create() ( and StartDoc() ) must be called before printing can start.
METHOD Destroy() // Calls EndDoc() - restores default font, Deletes DC.
DESTRUCTOR Destruct()
@@ -130,8 +130,8 @@ CREATE CLASS win_Prn
METHOD SetPRC( nRow, nCol ) // Based on ::LineHeight and current ::CharWidth
METHOD PRow()
METHOD PCol()
METHOD MaxRow() // Based on ::LineHeight & Form dimensions
METHOD MaxCol() // Based on ::CharWidth & Form dimensions
METHOD MaxRow() // Based on ::LineHeight and Form dimensions
METHOD MaxCol() // Based on ::CharWidth and Form dimensions
METHOD MM_TO_POSX( nMm ) // Convert position on page from MM to pixel location Column
METHOD MM_TO_POSY( nMm ) // " " " " " " " " " Row

2
harbour/contrib/xhb/htjlist.prg
View File

@@ -4,7 +4,7 @@
/*
* Harbour Project source code:
* Generates Javascript & DHTML list menus
* Generates Javascript and DHTML list menus
* (see the website/jList dir for an example)
*
* Uses list.js and resize.js (heavily modified) found at

2
harbour/contrib/xhb/xcstr.prg
View File

@@ -260,7 +260,7 @@ FUNCTION ValToPrg( xVal, cName, nPad, aObjs )
FUNCTION PrgExpToVal( cExp )
RETURN &( cExp )
RETURN Eval( hb_macroBlock( cExp ) )
//

16
harbour/contrib/xhb/xhberr.prg
View File

@@ -364,7 +364,7 @@ STATIC FUNCTION LogError( oerr )
IF hb_IsFunction( "Select" )
FWriteLine( nHandle, "" )
FWriteLine( nHandle, "Current Area ......:" + strvalue( &( "Select()" ) ) )
FWriteLine( nHandle, "Current Area ......:" + strvalue( Eval( hb_macroBlock( "Select()" ) ) ) )
ENDIF
FWriteLine( nHandle, "" )
@@ -481,25 +481,25 @@ STATIC FUNCTION LogError( oerr )
hb_WAeval( {||
IF hb_IsFunction( "Select" )
FWriteLine( nHandle, "Work Area No ......: " + strvalue( &( "Select()" ) ) )
FWriteLine( nHandle, "Work Area No ......: " + strvalue( Eval( hb_macroBlock( "Select()" ) ) ) )
ENDIF
IF hb_IsFunction( "Alias" )
FWriteLine( nHandle, "Alias .............: " + &( "Alias()" ) )
FWriteLine( nHandle, "Alias .............: " + Eval( hb_macroBlock( "Alias()" ) ) )
ENDIF
IF hb_IsFunction( "RecNo" )
FWriteLine( nHandle, "Current Recno .....: " + strvalue( &( "RecNo()" ) ) )
FWriteLine( nHandle, "Current Recno .....: " + strvalue( Eval( hb_macroBlock( "RecNo()" ) ) ) )
ENDIF
IF hb_IsFunction( "DbFilter" )
FWriteLine( nHandle, "Current Filter ....: " + &( "dbFilter()" ) )
FWriteLine( nHandle, "Current Filter ....: " + Eval( hb_macroBlock( "dbFilter()" ) ) )
ENDIF
IF hb_IsFunction( "DbRelation" )
FWriteLine( nHandle, "Relation Exp. .....: " + &( "dbRelation()" ) )
FWriteLine( nHandle, "Relation Exp. .....: " + Eval( hb_macroBlock( "dbRelation()" ) ) )
ENDIF
IF hb_IsFunction( "IndexOrd" )
FWriteLine( nHandle, "Index Order .......: " + strvalue( &( "IndexOrd(0)" ) ) )
FWriteLine( nHandle, "Index Order .......: " + strvalue( Eval( hb_macroBlock( "IndexOrd(0)" ) ) ) )
ENDIF
IF hb_IsFunction( "IndexKey" )
FWriteLine( nHandle, "Active Key ........: " + strvalue( &( "IndexKey(0)" ) ) )
FWriteLine( nHandle, "Active Key ........: " + strvalue( Eval( hb_macroBlock( "IndexKey(0)" ) ) ) )
ENDIF
FWriteLine( nHandle, "" )
RETURN .T.

2
harbour/contrib/xhb/xhbtedit.prg
View File

@@ -78,7 +78,7 @@
* Teditor Fix: v2.0 2003-11-17
* Copyright 2003 Lance Owens <servant@gnosis.org>
*
* This Revised Version has a completely rewritten edit method key commands, with dynamic line & paragraph reformatting.
* This Revised Version has a completely rewritten edit method key commands, with dynamic line and paragraph reformatting.
* Includes a fix for the bugs in TEditor key processing that previously caused array errors
*
* Note: -- If using the paste function to enter text, increase size of keyboard buffer to 2048 or 4096!

2
harbour/contrib/xhb/xhw32prn.prg
View File

@@ -8,7 +8,7 @@
* hiding some differences between Harbour and xHarbour
*
* original WIN32PRN/WIN_PRN class author:
* Copyright 2004 Peter Rees <peter@rees.co.nz> Rees Software & Systems Ltd
* Copyright 2004 Peter Rees <peter@rees.co.nz> Rees Software and Systems Ltd
* this wrapper:
* Copyright 2010 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
* www - http://harbour-project.org

2
harbour/src/rdd/hbsix/sxcompat.prg
View File

@@ -527,7 +527,7 @@ FUNCTION sx_VFGet( cExpr, nLen )
* we can simply evaluate given expression */
IF Used() .AND. PCount() == 2
RETURN PadR( &cExpr, nLen )
RETURN PadR( Eval( hb_macroBlock( cExpr ) ), nLen )
ENDIF
RETURN NIL

2
harbour/src/rtl/achoice.prg
View File

@@ -670,7 +670,7 @@ STATIC FUNCTION Ach_Select( alSelect, nPos )
IF nPos >= 1 .AND. nPos <= Len( alSelect )
sel := alSelect[ nPos ]
IF HB_ISSTRING( sel ) .AND. ! Empty( sel )
sel := &sel
sel := Eval( hb_macroBlock( sel ) )
ENDIF
IF HB_ISLOGICAL( sel )
RETURN sel

7
harbour/src/rtl/browse.prg
View File

@@ -318,6 +318,7 @@ STATIC FUNCTION DoGet( oBrw, lAppend )
LOCAL lScore, lExit, bIns, nCursor
LOCAL oCol, oGet
LOCAL cIndexKey, cForExp, xKeyValue
LOCAL bIndexKey
LOCAL lSuccess, nKey, xValue
oBrw:HitTop := .F.
@@ -330,7 +331,7 @@ STATIC FUNCTION DoGet( oBrw, lAppend )
SC_NORMAL, SC_INSERT ) ) } )
nCursor := SetCursor( iif( ReadInsert(), SC_INSERT, SC_NORMAL ) )
IF ! Empty( cIndexKey := IndexKey( 0 ) )
xKeyValue := &cIndexKey
xKeyValue := Eval( bIndexKey := hb_macroBlock( cIndexKey ) )
ENDIF
oCol := oBrw:GetColumn( oBrw:ColPos )
@@ -346,10 +347,10 @@ STATIC FUNCTION DoGet( oBrw, lAppend )
Eval( oCol:Block, xValue )
IF ! lAppend .AND. ! Empty( cForExp := ordFor( IndexOrd() ) ) .AND. ;
! &cForExp
! Eval( hb_macroBlock( cForExp ) )
dbGoTop()
ENDIF
IF ! lAppend .AND. ! Empty( cIndexKey ) .AND. ! xKeyValue == &cIndexKey
IF ! lAppend .AND. ! Empty( cIndexKey ) .AND. ! xKeyValue == Eval( bIndexKey )
lSuccess := .T.
ENDIF
ENDIF

4
harbour/src/rtl/dbedit.prg
View File

@@ -315,7 +315,7 @@ STATIC FUNCTION CallUser( oBrowse, xUserFunc, nKey, lAppend, lFlag )
nAction := iif( HB_ISBLOCK( xUserFunc ), ;
Eval( xUserFunc, nMode, oBrowse:colPos ), ;
iif( HB_ISSTRING( xUserFunc ) .AND. ! Empty( xUserFunc ), ;
&xUserFunc( nMode, oBrowse:colPos ), ;
&xUserFunc( nMode, oBrowse:colPos ), ; /* NOTE: Macro operator! */
iif( nKey == K_ENTER .OR. nKey == K_ESC, DE_ABORT, DE_CONT ) ) )
IF ! lAppend .AND. Eof() .AND. ! IsDbEmpty()
@@ -343,7 +343,7 @@ STATIC FUNCTION CallUser( oBrowse, xUserFunc, nKey, lAppend, lFlag )
lAppend := .F.
IF ( Set( _SET_DELETED ) .AND. Deleted() ) .OR. ;
( ! Empty( dbFilter() ) .AND. ! &( dbFilter() ) )
( ! Empty( dbFilter() ) .AND. ! Eval( hb_macroBlock( dbFilter() ) ) )
dbSkip()
ENDIF
IF Eof()