From 94a1d97b99756888f3c9b2b601b34a8aab3e6438 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 8 Sep 2010 16:47:33 +0000 Subject: [PATCH] 2010-09-08 18:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/rtl/ttopbar.prg ! Added missing cargo instvar. --- harbour/ChangeLog | 36 ++++++++++++++++++++---------------- harbour/src/rtl/ttopbar.prg | 2 ++ 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0f9854ffea..49507995f4 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2010-09-08 18:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * src/rtl/ttopbar.prg + ! Added missing cargo instvar. + 2010-09-08 18:28 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) + harbour/include/harbour.hbx * added new JSON functions @@ -27,31 +31,31 @@ ; C level functions: char * hb_jsonEncode( PHB_ITEM pValue, HB_SIZE * pnLen ); pValue - value to encode; - pnLen - if pnLen is not NULL, length of returned buffer is + pnLen - if pnLen is not NULL, length of returned buffer is stored to *pnLen; - returns pointer to encoded JSON buffer. buffer must be fried + returns pointer to encoded JSON buffer. buffer must be fried by the caller. - + HB_SIZE hb_jsonDecode( const char * szSource, PHB_ITEM pValue ); szSource - JSON source; - pValue - item to store decoded value. Item value is + pValue - item to store decoded value. Item value is undetermined in case of error; - returns number of bytes decoded from the buffer. This allows - to use the remaining part of the buffer for some other + returns number of bytes decoded from the buffer. This allows + to use the remaining part of the buffer for some other purposes. Returns 0 on error. - + Harbour level functions: hb_jsonDecode( cJSON, @xValue ) --> nLengthDecoded hb_jsonEncode( xValue ) --> cJSON - + Note: - - Harbour types unsupported by JSON (date, timestamp, etc.) are + - Harbour types unsupported by JSON (date, timestamp, etc.) are encoded as null values; - strings are encoded in UTF-8; - - JSON encode functions are safe for recursive arrays and hashes. - Recursive part of array or hash will be stored as null. JSON - encoder still allows to use same structure in the leaves, in - this case content will be duplicate. + - JSON encode functions are safe for recursive arrays and hashes. + Recursive part of array or hash will be stored as null. JSON + encoder still allows to use same structure in the leaves, in + this case content will be duplicate. I.e.: xI := {1, NIL} xI[2] := xI @@ -102,13 +106,13 @@ hb_fNameSplit( cSource, , @cName ) => cName "project_title" Last compiled project's title. If no project is yet compiled - in current session of hbIDE, then project title of current - set project is used. If no current project is set, empty + in current session of hbIDE, then project title of current + set project is used. If no current project is set, empty string is substituted. "project_path" Last compiled project's path. Rest per "project_title" above. "project_output_path" - Last compiled project's output path. If no project has been + Last compiled project's output path. If no project has been compiled under current session, null string is substituted. Here no assumption is taken from current set project. diff --git a/harbour/src/rtl/ttopbar.prg b/harbour/src/rtl/ttopbar.prg index a206f1c651..13b07c269c 100644 --- a/harbour/src/rtl/ttopbar.prg +++ b/harbour/src/rtl/ttopbar.prg @@ -66,6 +66,8 @@ CREATE CLASS TOPBARMENU FUNCTION HBTopBarMenu EXPORTED: + VAR cargo + METHOD addItem( oItem ) METHOD delItem( nPos ) METHOD display()