diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4fc200a22a..838ecdef03 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,20 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-01-14 01:35 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * src/rtl/memoedit.prg + ! Fixed to set K_ESC as lastkey() if exiting with changed + buffer and answering 'yes' to confirmation question. + Thanks Przemek for reporting it. + ! Fixed to not save buffer if exiting with and + SET SCOREBOARD OFF. + + * src/rtl/tget.prg + % Minor optimization when displaying delim chars. + + * contrib/hbwin/win_prn3.c + ! Fixed function name in file header comment. + 2010-01-14 00:30 UTC+0100 Xavi (jarabal/at/gmail.com) * harbour/contrib/hbwin/win_prn3.c * pacified warnings diff --git a/harbour/contrib/hbwin/win_prn3.c b/harbour/contrib/hbwin/win_prn3.c index a56e390a94..95057d9933 100644 --- a/harbour/contrib/hbwin/win_prn3.c +++ b/harbour/contrib/hbwin/win_prn3.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * SETDEFAULTPRINTER() + * WIN_SETDEFAULTPRINTER() * * Copyright 2009 Viktor Szakats (harbour.01 syenar.hu) (based on MS sample code) * www - http://www.harbour-project.org diff --git a/harbour/src/rtl/memoedit.prg b/harbour/src/rtl/memoedit.prg index 5ad9dd998a..9cd35ba883 100644 --- a/harbour/src/rtl/memoedit.prg +++ b/harbour/src/rtl/memoedit.prg @@ -171,11 +171,13 @@ METHOD KeyboardHook( nKey ) CLASS HBMemoEditor RestScreen( ::nTop, ::nRight - 18, ::nTop, ::nRight, cBackScr ) SetPos( nRow, nCol ) - IF nYesNoKey == Asc( "Y" ) .or. nYesNoKey == Asc( "y" ) + IF nYesNoKey == Asc( "Y" ) .OR. nYesNoKey == Asc( "y" ) + hb_SetLastKey( K_ESC ) /* Cl*pper compatibility */ ::lSaved := .F. ::lExitEdit := .T. ENDIF ELSE + ::lSaved := .F. ::lExitEdit := .T. ENDIF ENDIF diff --git a/harbour/src/rtl/tget.prg b/harbour/src/rtl/tget.prg index 3b012a5c2d..379cfe0d24 100644 --- a/harbour/src/rtl/tget.prg +++ b/harbour/src/rtl/tget.prg @@ -336,12 +336,12 @@ METHOD display() CLASS GET IF Set( _SET_DELIMITERS ) .AND. !::hasFocus #ifdef HB_COMPAT_C53 - hb_dispOutAt( ::nRow, ::nCol - 1, SubStr( Set( _SET_DELIMCHARS ), 1, 1 ), hb_ColorIndex( ::cColorSpec, GET_CLR_UNSELECTED ) ) - hb_dispOutAt( ::nRow, nColPos , SubStr( Set( _SET_DELIMCHARS ), 2, 1 ), hb_ColorIndex( ::cColorSpec, GET_CLR_UNSELECTED ) ) + hb_dispOutAt( nRowPos, ::nCol - 1, SubStr( Set( _SET_DELIMCHARS ), 1, 1 ), hb_ColorIndex( ::cColorSpec, GET_CLR_UNSELECTED ) ) + hb_dispOutAt( nRowPos, nColPos , SubStr( Set( _SET_DELIMCHARS ), 2, 1 ), hb_ColorIndex( ::cColorSpec, GET_CLR_UNSELECTED ) ) #else /* NOTE: C5.2 will use the default color. We're replicating this here. [vszakats] */ - hb_dispOutAt( ::nRow, ::nCol - 1, SubStr( Set( _SET_DELIMCHARS ), 1, 1 ) ) - hb_dispOutAt( ::nRow, nColPos , SubStr( Set( _SET_DELIMCHARS ), 2, 1 ) ) + hb_dispOutAt( nRowPos, ::nCol - 1, SubStr( Set( _SET_DELIMCHARS ), 1, 1 ) ) + hb_dispOutAt( nRowPos, nColPos , SubStr( Set( _SET_DELIMCHARS ), 2, 1 ) ) #endif ++nColPos ENDIF