diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index e3280519b1..8c60a8a88b 100644 --- a/harbour/ChangeLog.txt +++ b/harbour/ChangeLog.txt @@ -10,6 +10,18 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2012-11-29 01:38 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/gtwvg/tests/_utils.prg + ! fixed to not define a function which is already + defined as a macro + + * contrib/gtwvg/wvgparts.ch + * minor + + * contrib/gtwvg/hbgtwvg.ch + ! fixed the way some HB_GTE_* event macro collision + is avoided with core + 2012-11-29 01:20 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/rddads/ads.ch ! added missing self-guard diff --git a/harbour/contrib/gtwvg/hbgtwvg.ch b/harbour/contrib/gtwvg/hbgtwvg.ch index 7089ac82f7..1aff44adb1 100644 --- a/harbour/contrib/gtwvg/hbgtwvg.ch +++ b/harbour/contrib/gtwvg/hbgtwvg.ch @@ -55,7 +55,7 @@ /* Extended GT Manipulation Constants */ -#ifndef HB_GTE_ACTIVATE +#ifndef HB_LEGACY_LEVEL4 #define HB_GTE_ACTIVATE 1 #define HB_GTE_SETFOCUS 2 #define HB_GTE_KILLFOCUS 3 diff --git a/harbour/contrib/gtwvg/tests/_utils.prg b/harbour/contrib/gtwvg/tests/_utils.prg index ee8c903105..59bbb369e7 100644 --- a/harbour/contrib/gtwvg/tests/_utils.prg +++ b/harbour/contrib/gtwvg/tests/_utils.prg @@ -267,10 +267,6 @@ FUNCTION WvtWindowExpand( nUnits ) RETURN .T. -FUNCTION RGB( r, g, b ) - - RETURN r + ( g * 256 ) + ( b * 256 * 256 ) - FUNCTION VouChoice( aChoices ) LOCAL scr, clr, nChoice diff --git a/harbour/contrib/gtwvg/wvgparts.ch b/harbour/contrib/gtwvg/wvgparts.ch index 78867713ca..4d012df86b 100644 --- a/harbour/contrib/gtwvg/wvgparts.ch +++ b/harbour/contrib/gtwvg/wvgparts.ch @@ -51,7 +51,6 @@ */ #ifndef _WVG_CH - #define _WVG_CH /*-*/