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

2015-10-06 12:37 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* src/rtl/hbbfsock.c
    ! typo in comment

  * src/rtl/mlcfunc.c
    * casting

  * src/rtl/memoedit.prg
  * src/rtl/teditor.prg
    * formatting and few modifications to reduce some differences between
      core and Viktor's branch
This commit is contained in:
Przemysław Czerpak
2015-10-06 12:37:29 +02:00
parent d32d766c98
commit db11c4a1cf
5 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rtl/hbbfsock.c
View File

@@ -1,6 +1,6 @@
/*
* Harbour Project source code:
* Harbour extended socket filter with ZLIB compression
* Harbour extended socket filter with BlowFish encryption
*
* Copyright 2015 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
* www - http://harbour-project.org

4
src/rtl/memoedit.prg
View File

@@ -305,8 +305,8 @@ METHOD InsertState( lInsState ) CLASS HBMemoEditor
IF HB_ISLOGICAL( lInsState ) .AND. ::lEditAllow
Set( _SET_INSERT, lInsState )
SetCursor( iif( lInsState, SC_INSERT, SC_NORMAL ) )
IF SET( _SET_SCOREBOARD )
hb_dispOutAt( 0, MaxCol() - 19, iif( lInsState, "<insert>", " " ) )
IF Set( _SET_SCOREBOARD )
hb_DispOutAt( 0, MaxCol() - 19, iif( lInsState, "<insert>", " " ) )
ENDIF
ENDIF

2
src/rtl/mlcfunc.c
View File

@@ -660,7 +660,7 @@ HB_FUNC( HB_MLEVAL )
if( nRepl-- == 0 )
break;
if( !cdp )
pszLine[ nDst++ ] = ch;
pszLine[ nDst++ ] = ( char ) ch;
else if( ! HB_CDPCHAR_PUT( cdp, pszLine, nLineLength + 1, &nDst, ch ) )
break;
}

26
src/rtl/teditor.prg
View File

@@ -217,7 +217,7 @@ METHOD LoadText( cText ) CLASS HBEditor
// Saves file being edited, if there is no file name does nothing, returns .T. if OK
METHOD SaveFile() CLASS HBEditor
RETURN ! Empty( ::cFile ) .AND. ;
RETURN ! HB_ISNULL( ::cFile ) .AND. ;
! ::lDirty := ! hb_MemoWrit( ::cFile, ::GetText() )
// Add a new Line of text at end of current text
@@ -243,7 +243,7 @@ METHOD RemoveLine( nRow ) CLASS HBEditor
// Return line n of text
METHOD GetLine( nRow ) CLASS HBEditor
RETURN iif( nRow >=1 .AND. nRow <= ::LineCount, ::aText[ nRow ]:cText, "" )
RETURN iif( nRow >= 1 .AND. nRow <= ::LineCount, ::aText[ nRow ]:cText, "" )
// Return text length of line n
METHOD LineLen( nRow ) CLASS HBEditor
@@ -366,10 +366,10 @@ METHOD MoveCursor( nKey ) CLASS HBEditor
SWITCH hb_keyStd( nKey )
CASE K_DOWN
IF ! ::lEditAllow
::Goto( ::nFirstRow + ::nNumRows, ::nCol )
ELSE
IF ::lEditAllow
::Goto( ::nRow + 1, ::nCol )
ELSE
::Goto( ::nFirstRow + ::nNumRows, ::nCol )
ENDIF
EXIT
@@ -382,10 +382,10 @@ METHOD MoveCursor( nKey ) CLASS HBEditor
EXIT
CASE K_UP
IF ! ::lEditAllow
::Goto( ::nFirstRow - 1, ::nCol )
ELSE
IF ::lEditAllow
::Goto( ::nRow - 1, ::nCol )
ELSE
::Goto( ::nFirstRow - 1, ::nCol )
ENDIF
EXIT
@@ -480,9 +480,9 @@ METHOD Edit( nPassedKey ) CLASS HBEditor
CASE ( bKeyBlock := SetKey( nKeyStd ) ) != NIL
Eval( bKeyBlock )
CASE hb_ULen( cKey := iif( nKeyStd == K_TAB .AND. Set( _SET_INSERT ), ;
Space( TabCount( ::nTabWidth, ::nCol ) ), ;
hb_keyChar( nKey ) ) ) > 0
CASE ! HB_ISNULL( cKey := iif( nKeyStd == K_TAB .AND. Set( _SET_INSERT ), ;
Space( TabCount( ::nTabWidth, ::nCol ) ), ;
hb_keyChar( nKey ) ) )
::lDirty := .T.
oLine := ::aText[ ::nRow ]
IF ( nPos := ::nCol - hb_ULen( oLine:cText ) - 1 ) > 0
@@ -602,9 +602,9 @@ METHOD BrowseText( nPassedKey ) CLASS HBEditor
DO WHILE ! ::lExitEdit
IF nPassedKey == NIL
IF ( nKey := Inkey() ) == 0
IF ( nKey := Inkey(, hb_bitOr( Set( _SET_EVENTMASK ), HB_INKEY_EXT ) ) ) == 0
::IdleHook()
nKey := Inkey( 0 )
nKey := Inkey( 0, hb_bitOr( Set( _SET_EVENTMASK ), HB_INKEY_EXT ) )
ENDIF
ELSE
nKey := nPassedKey