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

2010-04-08 18:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* 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 <br /> instead of <br>.
    * Changed one ocurrence of CRLF to Chr( 13 ) + Chr( 10 ).
This commit is contained in:
Viktor Szakats
2010-04-08 16:12:53 +00:00
parent e05f487a83
commit c90dcfc5e3
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -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 <br /> instead of <br>.
* 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.

5
harbour/contrib/hbide/hbide.ch
View File

@@ -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

11
harbour/contrib/hbide/idemisc.prg
View File

@@ -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 += "<font color = red>" + padl( hb_ntos( nFrom + i ), nW ) + "</font><br>"
s += "<font color = red>" + padl( hb_ntos( nFrom + i ), nW ) + "</font><br />"
ELSE
//s += padl( hb_ntos( nFrom + i ), nW ) + CRLF
s += padl( hb_ntos( nFrom + i ), nW ) + "<br>"
s += padl( hb_ntos( nFrom + i ), nW ) + "<br />"
ENDIF
NEXT
@@ -2065,4 +2065,3 @@ FUNCTION hbide_parseToolComponents( cCompositeTool )
RETURN a_
/*----------------------------------------------------------------------*/