From c90dcfc5e36ba90dd0464276dad5f88af598591a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 8 Apr 2010 16:12:53 +0000 Subject: [PATCH] 2010-04-08 18:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbide/hbide.ch ! Fixed to map CRLF to hb_osNewLine() instead of windows specific Chr( 13 ) + Chr( 10 ). Better would be to rename this to _EOL, and _EOL to _CHR_LF. * contrib/hbide/idemisc.prg ! Fixed to use
instead of
. * Changed one ocurrence of CRLF to Chr( 13 ) + Chr( 10 ). --- harbour/ChangeLog | 11 +++++++++++ harbour/contrib/hbide/hbide.ch | 5 ++--- harbour/contrib/hbide/idemisc.prg | 11 +++++------ 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5ba4e29c27..04b5eea57b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,17 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-04-08 18:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbide/hbide.ch + ! Fixed to map CRLF to hb_osNewLine() instead of windows + specific Chr( 13 ) + Chr( 10 ). + Better would be to rename this to _EOL, and _EOL to + _CHR_LF. + + * contrib/hbide/idemisc.prg + ! Fixed to use
instead of
. + * Changed one ocurrence of CRLF to Chr( 13 ) + Chr( 10 ). + 2010-04-08 08:38 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbxbp/xbpdialog.prg ! Initiated :clipChildren instance variable on XbpDrawingArea() class. diff --git a/harbour/contrib/hbide/hbide.ch b/harbour/contrib/hbide/hbide.ch index c37f38672f..9c457038ff 100644 --- a/harbour/contrib/hbide/hbide.ch +++ b/harbour/contrib/hbide/hbide.ch @@ -53,8 +53,8 @@ #ifndef __HBIDE_CH #define __HBIDE_CH -#define CRLF chr( 13 )+chr( 10 ) -#define _EOL chr( 10 ) +#define CRLF hb_osNewLine() +#define _EOL Chr( 10 ) #define HBIDE_USE_UIC @@ -176,4 +176,3 @@ #define ACT_VISINMENU 6 #endif - diff --git a/harbour/contrib/hbide/idemisc.prg b/harbour/contrib/hbide/idemisc.prg index e3b41da7f8..5622d8e67a 100644 --- a/harbour/contrib/hbide/idemisc.prg +++ b/harbour/contrib/hbide/idemisc.prg @@ -563,7 +563,7 @@ FUNCTION hbide_arrayToMemoHtml( a_ ) /*----------------------------------------------------------------------*/ FUNCTION hbide_memoToArray( s ) - LOCAL aLine := hb_ATokens( StrTran( RTrim( s ), CRLF, _EOL ), _EOL ) + LOCAL aLine := hb_ATokens( StrTran( RTrim( s ), Chr( 13 ) + Chr( 10 ), _EOL ), _EOL ) LOCAL nNewSize := 0 LOCAL line @@ -1047,8 +1047,8 @@ function hbide_toString( x, lLineFeed, lInherited, lType, cFile, lForceLineFeed CASE ( t == "O" ) IF lInherited - && É necessário linkar \harbour\lib\xhb.lib - **s := iif( lType, "[O]=", "" ) + hb_dumpvar( x ) + iif( lLineFeed, CRLF, "" ) + // É necessário linkar \harbour\lib\xhb.lib + // s := iif( lType, "[O]=", "" ) + hb_dumpvar( x ) + iif( lLineFeed, CRLF, "" ) s := '' + iif( lLineFeed, CRLF, "" ) ELSE s := iif( lType, "[O]=", "" ) + x:ClassName()+'():New()' + iif( lLineFeed, CRLF, "" ) @@ -1204,10 +1204,10 @@ FUNCTION hbide_buildLinesLabel( nFrom, nTo, nW, nMax ) FOR i := 0 TO n IF ( ( nFrom + i ) % 10 ) == 0 - s += "" + padl( hb_ntos( nFrom + i ), nW ) + "
" + s += "" + padl( hb_ntos( nFrom + i ), nW ) + "
" ELSE //s += padl( hb_ntos( nFrom + i ), nW ) + CRLF - s += padl( hb_ntos( nFrom + i ), nW ) + "
" + s += padl( hb_ntos( nFrom + i ), nW ) + "
" ENDIF NEXT @@ -2065,4 +2065,3 @@ FUNCTION hbide_parseToolComponents( cCompositeTool ) RETURN a_ /*----------------------------------------------------------------------*/ -