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

2008-04-23 18:03 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* source/rtl/achoice.prg
   * source/rtl/alert.prg
   * source/rtl/browse.prg
   * source/rtl/einstv52.prg
   * source/rtl/einstvar.prg
   * source/rtl/persist.prg
   * source/rtl/tclass.prg
   * source/rtl/teditor.prg
   * source/rtl/typefile.prg
   * source/rtl/wait.prg
     * Formatting.
     * != -> !( == ) for strings.
This commit is contained in:
Viktor Szakats
2008-04-23 16:05:30 +00:00
parent 1100bf13dc
commit 70948cfc33
11 changed files with 328 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -8,6 +8,20 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-04-23 18:03 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* source/rtl/achoice.prg
* source/rtl/alert.prg
* source/rtl/browse.prg
* source/rtl/einstv52.prg
* source/rtl/einstvar.prg
* source/rtl/persist.prg
* source/rtl/tclass.prg
* source/rtl/teditor.prg
* source/rtl/typefile.prg
* source/rtl/wait.prg
* Formatting.
* != -> !( == ) for strings.
2008-04-23 14:03 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* source/rtl/tget.prg
! Fixed o[13] and o[14] content (they were swapped) in C5.3 mode.

8
harbour/source/rtl/achoice.prg
View File

@@ -131,7 +131,7 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo
nPos := 0
nAtTop := Max( 1, nPos - nNumRows + 1 )
ELSE
DO WHILE nPos < nLastItem .and. !Eval( bSelect, alSelect[ nPos ] )
DO WHILE nPos < nLastItem .AND. !Eval( bSelect, alSelect[ nPos ] )
nPos++
ENDDO
@@ -455,7 +455,7 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo
// Do nothing
nMode := AC_CONT
CASE nUserFunc == AC_GOTO
// Do nothing. The next keystroke won't be read and
// Do nothing. The next keystroke won't be read and
// this keystroke will be processed as a goto.
nMode := AC_GOTO
ENDCASE
@@ -469,7 +469,7 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo
nPos := 0
nAtTop := Max( 1, nPos - nNumRows + 1 )
ELSE
DO WHILE nPos < nLastItem .and. !Eval( bSelect, alSelect[ nPos ] )
DO WHILE nPos < nLastItem .AND. !Eval( bSelect, alSelect[ nPos ] )
nPos++
ENDDO
@@ -562,7 +562,7 @@ STATIC FUNCTION Ach_Limits( nFrstItem, nLastItem, nItems, bSelect, alSelect, acI
ELSE
nMode := AC_IDLE
nLastItem := nItems // Last valid item
DO WHILE nLastItem>0 .and. !Eval( bSelect, alSelect[ nLastItem ] )
DO WHILE nLastItem > 0 .AND. !Eval( bSelect, alSelect[ nLastItem ] )
nLastItem--
ENDDO
ENDIF

2
harbour/source/rtl/alert.prg
View File

@@ -112,7 +112,7 @@ FUNCTION Alert( xMessage, aOptions, cColorNorm, nDelay )
aOptions := {}
ENDIF
IF !ISCHARACTER( cColorNorm ) .or. EMPTY( cColorNorm )
IF !ISCHARACTER( cColorNorm ) .OR. EMPTY( cColorNorm )
cColorNorm := "W+/R" // first pair color (Box line and Text)
cColorHigh := "W+/B" // second pair color (Options buttons)
ELSE

2
harbour/source/rtl/browse.prg
View File

@@ -295,7 +295,7 @@ STATIC FUNCTION StatLine( oBrw, lAppend )
DispOutAt( nTop, nRight - 27, "Record " )
IF LastRec() == 0 .and. ! lAppend
IF LastRec() == 0 .AND. ! lAppend
DispOutAt( nTop, nRight - 20, "<none> " )
ELSEIF RecNo() == LastRec() + 1
DispOutAt( nTop, nRight - 40, " " )

2
harbour/source/rtl/einstv52.prg
View File

@@ -89,7 +89,7 @@ FUNCTION __eInstVar52( oVar, cMethod, xValue, cType, nSubCode, xMin, xMax )
oError:subcode := nSubCode
oError:args := { xValue }
xValue := EVAL( ERRORBLOCK(), oError )
IF VALTYPE( xValue ) != cType
IF !( VALTYPE( xValue ) == cType )
__errInHandler()
ENDIF
ENDIF

4
harbour/source/rtl/einstvar.prg
View File

@@ -70,7 +70,7 @@ FUNCTION __eInstVar53( oVar, cMethod, xValue, cType, nSubCode, bValid )
LOCAL oError
IF VALTYPE( xValue ) != cType .OR. ;
IF !( VALTYPE( xValue ) == cType ) .OR. ;
( bValid != NIL .AND. !EVAL( bValid, oVar, xValue ) )
oError := ErrorNew()
oError:description := HB_LANGERRMSG( 1 )
@@ -86,7 +86,7 @@ FUNCTION __eInstVar53( oVar, cMethod, xValue, cType, nSubCode, bValid )
oError:subcode := nSubCode
oError:args := { xValue }
xValue := EVAL( ERRORBLOCK(), oError )
IF VALTYPE( xValue ) != cType
IF !( VALTYPE( xValue ) == cType )
__errInHandler()
ENDIF
ENDIF

2
harbour/source/rtl/persist.prg
View File

@@ -130,7 +130,7 @@ METHOD SaveToText( cObjectName, nIndent ) CLASS HBPersistent
uNewValue := __objSendMsg( oNew, aProperties[ n ] )
cType := ValType( uValue )
if cType != ValType( uNewValue ) .OR. ! uValue == uNewValue
if !( cType == ValType( uNewValue ) ) .OR. ! uValue == uNewValue
do case
case cType == "A"

10
harbour/source/rtl/tclass.prg
View File

@@ -296,10 +296,12 @@ STATIC PROCEDURE Create()
//----------------------------------------------------------------------------//
STATIC FUNCTION Instance()
LOCAL Self := QSelf()
Local oInstance := __clsInst( ::hClass )
/*oInstance:Class := Self:Class*/
RETURN oInstance
LOCAL Self := QSelf()
LOCAL oInstance := __clsInst( ::hClass )
/*oInstance:Class := Self:Class*/
RETURN oInstance
//----------------------------------------------------------------------------//

593
harbour/source/rtl/teditor.prg
View File

File diff suppressed because it is too large Load Diff

2
harbour/source/rtl/typefile.prg
View File

@@ -108,7 +108,7 @@ PROCEDURE __TypeFile( cFile, lPrint )
oErr:OsCode := FERROR()
oErr:tries := ++nRetries
xRecover := Eval( ErrorBlock(), oErr )
IF ISLOGICAL( xRecover ) .and. !xRecover // user select "Default"
IF ISLOGICAL( xRecover ) .AND. !xRecover // user select "Default"
RETURN
ENDIF
ENDDO

3
harbour/source/rtl/wait.prg
View File

@@ -66,7 +66,7 @@ FUNCTION __Wait( xPrompt )
IF ( bBlock := SetKey( nKey ) ) != NIL
Eval( bBlock, ProcName( 1 ), ProcLine( 1 ), "" )
ELSE
IF nKey >= 32 .and. nKey <= 255
IF nKey >= 32 .AND. nKey <= 255
QQOut( Chr( nKey ) )
ELSE
nKey := 0
@@ -78,4 +78,3 @@ FUNCTION __Wait( xPrompt )
ENDDO
RETURN Chr( nKey )