20000412-03:14 GMT+1 Victor Szakats <info@szelvesz.hu>

harbour/ChangeLog

@@ -1,3 +1,13 @@
+20000412-03:14 GMT+1 Victor Szakats <info@szelvesz.hu>
+
+   * source/tools/ctmisc.prg
+     ! CT_SAVEGETS() fixed to empty GetList.
+
+   * source/rtl/gtapi.c
+     + hb_gtGetColorStr() readded the previous version of colorspec generation
+       and put the CA-Clipper compatible one between STRICT guards.
+       (Talking about the "W+*/GR" vs. "W+/GR*" issue.)
+
 20000411-20:30 GMT -3 Luiz Rafael Culik <culik@sl.conex.net
    +doc/class_tp.txt
      *Doc template for classes

harbour/source/rtl/gtapi.c

@@ -414,14 +414,31 @@ USHORT hb_gtGetColorStr( char * pszColorString )
 
          if( j == 0 )
          {
+            /* NOTE: When STRICT is on, Harbour will put both the "*" and "+"
+                     chars to the first half of the colorspec (like "W+*/B"), 
+                     which is quite ugly, otherwise it will put the "+" to the 
+                     first half and the "*" to the second (like "W+/B*"), which
+                     is how it should be done. [vszakats] */
+
+#ifdef HB_C52_STRICT
             if( ( s_pColor[ uiColorIndex ] & 0x80 ) != 0 )
                pszColorString[ iPos++ ] = '*';
+#endif
 
             if( ( s_pColor[ uiColorIndex ] & 0x08 ) != 0 )
                pszColorString[ iPos++ ] = '+';
 
             pszColorString[ iPos++ ] = '/';
          }
+#ifndef HB_C52_STRICT
+         else
+         {
+            if( ( s_pColor[ uiColorIndex ] & 0x80 ) != 0 )
+               pszColorString[ iPos++ ] = '*';
+         }
+#endif
+
+         nColor = ( s_Color[ i ] >> 4 ) & 7;
 
          nColor = ( s_pColor[ uiColorIndex ] >> 4 ) & 7;
       }

harbour/source/tools/ctmisc.prg

@@ -75,7 +75,11 @@ FUNCTION CT_RESTGETS( aGetList )
    RETURN .T.
 
 FUNCTION CT_SAVEGETS()
-   RETURN GetList
+   LOCAL aGetList := GetList
+
+   GetList := {}
+
+   RETURN aGetList
 
 FUNCTION CT_SCREENMIX( c, a, row, col )