From b89b0033250193ec35dfa134e8b397055cc1c7ed Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 11 Nov 2012 20:42:29 +0000 Subject: [PATCH] 2012-11-11 21:41 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/hbct/hbct.hbx * contrib/hbct/scrmark.prg * contrib/hbct/showtime.prg * minor format fixes --- harbour/ChangeLog | 6 ++++++ harbour/contrib/hbct/hbct.hbx | 2 +- harbour/contrib/hbct/scrmark.prg | 8 +++++--- harbour/contrib/hbct/showtime.prg | 3 +-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f831c7192e..e33f39a80a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2012-11-11 21:41 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/hbct/hbct.hbx + * contrib/hbct/scrmark.prg + * contrib/hbct/showtime.prg + * minor format fixes + 2012-11-11 20:39 UTC+0100 Viktor Szakats (harbour syenar.net) * extras/hbdroid/msginfo.c ! fixed to pass strings to Java in UTF-8 diff --git a/harbour/contrib/hbct/hbct.hbx b/harbour/contrib/hbct/hbct.hbx index 9840e8e4b2..87808cd5fb 100644 --- a/harbour/contrib/hbct/hbct.hbx +++ b/harbour/contrib/hbct/hbct.hbx @@ -407,7 +407,7 @@ DYNAMIC XToC DYNAMIC ZeroInsert DYNAMIC ZeroRemove DYNAMIC _WStack -DYNAMIC __hbct_DSPTime +DYNAMIC __hbct_DspTime DYNAMIC __hbct_key_c_to_n DYNAMIC __hbct_key_n_to_c diff --git a/harbour/contrib/hbct/scrmark.prg b/harbour/contrib/hbct/scrmark.prg index 8b8dabaaf4..988abbb615 100644 --- a/harbour/contrib/hbct/scrmark.prg +++ b/harbour/contrib/hbct/scrmark.prg @@ -86,10 +86,12 @@ FUNCTION ScreenMark( cSearch, xAttr, lUpperLower, lAll, cForward, cTrailing ) ENDIF DO WHILE ( nAt := AtNum( cSearch, cScreen, nCount ) ) != 0 + IF ( nAt == 1 .OR. cForward == NIL .OR. ; - SubStr( cScreen, nAt, 1 ) $ cForward ) .AND. ; - ( nAt == nLast .OR. cTrailing == NIL .OR. ; - SubStr( cScreen, nAt + nLen ) $ cTrailing ) + SubStr( cScreen, nAt, 1 ) $ cForward ) .AND. ; + ( nAt == nLast .OR. cTrailing == NIL .OR. ; + SubStr( cScreen, nAt + nLen ) $ cTrailing ) + lFound := .T. --nAt nRow := Int( nAt / nCols ) diff --git a/harbour/contrib/hbct/showtime.prg b/harbour/contrib/hbct/showtime.prg index d55c9a7aca..867d69baf7 100644 --- a/harbour/contrib/hbct/showtime.prg +++ b/harbour/contrib/hbct/showtime.prg @@ -7,7 +7,6 @@ * CT3 time function: SHOWTIME() * * Copyright 2007 Przemyslaw Czerpak - * * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -59,7 +58,7 @@ FUNCTION ShowTime( nRow, nCol, lNoSec, cColor, l12, lAmPm ) IF t_hTimer != NIL hb_idleDel( t_hTimer ) ENDIF - t_hTimer := hb_idleAdd( {|| __HBCT_DSPTIME( nRow, nCol, lNoSec, cColor, ; + t_hTimer := hb_idleAdd( {|| __hbct_DspTime( nRow, nCol, lNoSec, cColor, ; l12, lAmPm ) } ) ELSEIF t_hTimer != NIL hb_idleDel( t_hTimer )