From 3572482250ba768fe533ecf9ea896ef7e19a1fb9 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 29 Jan 2011 15:26:56 +0000 Subject: [PATCH] 2011-01-29 16:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/rtl/listbox.prg * Internal var renamed to reflect its type. * src/rtl/einstvar.prg * src/rtl/einstv52.prg * Fixed to use manifest constants. * utils/hbrun/hbrun.prg ! Fixed to allow case-insensitive match for headers on non-*nix platforms. --- harbour/ChangeLog | 12 ++++++++++++ harbour/src/rtl/einstv52.prg | 5 +++-- harbour/src/rtl/einstvar.prg | 7 ++++--- harbour/src/rtl/listbox.prg | 4 ++-- harbour/utils/hbrun/hbrun.prg | 6 ++++++ 5 files changed, 27 insertions(+), 7 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4e03aae8a3..45c3367e72 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,18 @@ The license applies to all entries newer than 2009-04-28. */ +2011-01-29 16:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * src/rtl/listbox.prg + * Internal var renamed to reflect its type. + + * src/rtl/einstvar.prg + * src/rtl/einstv52.prg + * Fixed to use manifest constants. + + * utils/hbrun/hbrun.prg + ! Fixed to allow case-insensitive match for headers on + non-*nix platforms. + 2011-01-29 14:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/utils/hbmk2/hbmk2.prg ! remove .d files from .hbmk working dir when -clean option is used diff --git a/harbour/src/rtl/einstv52.prg b/harbour/src/rtl/einstv52.prg index 84c0ba247c..b205fc1f49 100644 --- a/harbour/src/rtl/einstv52.prg +++ b/harbour/src/rtl/einstv52.prg @@ -52,6 +52,7 @@ */ #include "common.ch" +#include "error.ch" /* NOTE: In CA-Cl*pper 5.2/5.3 the cMethod argument seems to be ignored. */ @@ -77,8 +78,8 @@ FUNCTION __eInstVar52( oVar, cMethod, xValue, cType, nSubCode, xMin, xMax ) IF lError oError := ErrorNew() oError:description := hb_langErrMsg( 1 ) - oError:gencode := 1 - oError:severity := 2 + oError:gencode := EG_ARG + oError:severity := ES_ERROR oError:cansubstitute := .T. oError:subsystem := oVar:className #ifdef HB_CLP_STRICT diff --git a/harbour/src/rtl/einstvar.prg b/harbour/src/rtl/einstvar.prg index b1b8e7d140..08cde2773e 100644 --- a/harbour/src/rtl/einstvar.prg +++ b/harbour/src/rtl/einstvar.prg @@ -52,6 +52,7 @@ */ #include "common.ch" +#include "error.ch" /* NOTE: In CA-Cl*pper 5.2/5.3 the cMethod argument seems to be ignored. */ @@ -60,11 +61,11 @@ FUNCTION __eInstVar53( oVar, cMethod, xValue, cType, nSubCode, bValid ) LOCAL oError IF !( ValType( xValue ) == cType ) .OR. ; - ( bValid != NIL .AND. !Eval( bValid, oVar, xValue ) ) + ( bValid != NIL .AND. ! Eval( bValid, oVar, xValue ) ) oError := ErrorNew() oError:description := hb_langErrMsg( 1 ) - oError:gencode := 1 - oError:severity := 2 + oError:gencode := EG_ARG + oError:severity := ES_ERROR oError:cansubstitute := .T. oError:subsystem := oVar:className #ifdef HB_CLP_STRICT diff --git a/harbour/src/rtl/listbox.prg b/harbour/src/rtl/listbox.prg index 53ecfceb6b..f691c65af5 100644 --- a/harbour/src/rtl/listbox.prg +++ b/harbour/src/rtl/listbox.prg @@ -1094,7 +1094,7 @@ METHOD New( nTop, nLeft, nBottom, nRight, lDropDown ) FUNCTION ListBox( nTop, nLeft, nBottom, nRight, lDropDown ) RETURN HBListBox():New( nTop, nLeft, nBottom, nRight, lDropDown ) -FUNCTION _LISTBOX_( nTop, nLeft, nBottom, nRight, nSelect, aItems, cCaption,; +FUNCTION _LISTBOX_( nTop, nLeft, nBottom, nRight, xPos, aItems, cCaption,; cMessage, cColorSpec, bFBlock, bSBlock, lDropDown, lIsOpen, cBitmap ) LOCAL o := HBListBox():New( nTop, nLeft, nBottom, nRight, lDropDown ) @@ -1141,7 +1141,7 @@ FUNCTION _LISTBOX_( nTop, nLeft, nBottom, nRight, nSelect, aItems, cCaption,; o:bitmap := cBitmap ENDIF - o:select( nSelect ) + o:select( xPos ) ENDIF RETURN o diff --git a/harbour/utils/hbrun/hbrun.prg b/harbour/utils/hbrun/hbrun.prg index 6b36c5e979..1cf58b48b8 100644 --- a/harbour/utils/hbrun/hbrun.prg +++ b/harbour/utils/hbrun/hbrun.prg @@ -255,6 +255,12 @@ STATIC FUNCTION hbrun_CoreHeaderFiles() ADD HEADER TO hHeaders FILE "hbscalar.hbx" ADD HEADER TO hHeaders FILE "hbusrrdd.hbx" + #if defined( __PLATFORM__UNIX ) + hb_HCaseMatch( hHeaders, .T. ) + #else + hb_HCaseMatch( hHeaders, .F. ) + #endif + #else hHeaders := NIL