2012-09-28 18:17 UTC+0200 Viktor Szakats (harbour syenar.net)

* include/box.ch * src/rtl/browse.prg * src/rtl/radiogrp.prg * src/rtl/checkbox.prg * src/rtl/dbedit.prg * src/rtl/listbox.prg * src/rtl/scrollbr.prg * src/rtl/tmenuitm.prg * changed file mime-type to UTF8 + added UTF8 equivalent of CP437 encoded CHR() calls in comments. + use box.ch in radiogrp instead of locally defining the same strings
2012-09-28 16:22:54 +00:00
parent 223ce9b710
commit daf086733d
9 changed files with 38 additions and 22 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,21 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2012-09-28 18:17 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * include/box.ch
+  * src/rtl/browse.prg
+  * src/rtl/radiogrp.prg
+  * src/rtl/checkbox.prg
+  * src/rtl/dbedit.prg
+  * src/rtl/listbox.prg
+  * src/rtl/scrollbr.prg
+  * src/rtl/tmenuitm.prg
+    * changed file mime-type to UTF8
+    + added UTF8 equivalent of CP437 encoded CHR() calls
+      in comments.
+    + use box.ch in radiogrp instead of locally defining
+      the same strings
+
 2012-09-28 11:51 UTC+0200 Viktor Szakats (harbour syenar.net)
  * contrib/rddads/adsfunc.c
    ! another fix for ADS 6.00, as it turned out the header
@@ -732,8 +747,8 @@

 2012-09-25 00:20 UTC+0200 Viktor Szakats (harbour syenar.net)
  * utils/hbmk2/hbmk2.prg
-    + hbstart.hb is now searched also at standard location on *nix
-      system (the same places where hbmk.hbc is searched.)
+    + hbstart.hb is now searched also at standard locations on *nix
+      systems (the same places where hbmk.hbc is searched.)
    + hbstart.hb is now executed as normal script code
      (was line by line), so this .hb file can be just like
      any other .hb file.
--- a/harbour/include/box.ch
+++ b/harbour/include/box.ch
@@ -56,19 +56,19 @@
 /* #defines for DISPBOX() */

 /* Single-line */
-#define B_SINGLE        ( Chr( 218 ) + Chr( 196 ) + Chr( 191 ) + Chr( 179 ) + ;
+#define B_SINGLE        ( Chr( 218 ) + Chr( 196 ) + Chr( 191 ) + Chr( 179 ) + ; /* "┌─┐│┘─└│" */
                          Chr( 217 ) + Chr( 196 ) + Chr( 192 ) + Chr( 179 ) )

 /* Double-line */
-#define B_DOUBLE        ( Chr( 201 ) + Chr( 205 ) + Chr( 187 ) + Chr( 186 ) + ;
+#define B_DOUBLE        ( Chr( 201 ) + Chr( 205 ) + Chr( 187 ) + Chr( 186 ) + ; /* "╔═╗║╝═╚║" */
                          Chr( 188 ) + Chr( 205 ) + Chr( 200 ) + Chr( 186 ) )

 /* Single-line top, double-line sides */
-#define B_SINGLE_DOUBLE ( Chr( 214 ) + Chr( 196 ) + Chr( 183 ) + Chr( 186 ) + ;
+#define B_SINGLE_DOUBLE ( Chr( 214 ) + Chr( 196 ) + Chr( 183 ) + Chr( 186 ) + ; /* "╓─╖║╜─╙║" */
                          Chr( 189 ) + Chr( 196 ) + Chr( 211 ) + Chr( 186 ) )

 /* Double-line top, single-line sides */
-#define B_DOUBLE_SINGLE ( Chr( 213 ) + Chr( 205 ) + Chr( 184 ) + Chr( 179 ) + ;
+#define B_DOUBLE_SINGLE ( Chr( 213 ) + Chr( 205 ) + Chr( 184 ) + Chr( 179 ) + ; /* "╒═╕│╛═╘│" */
                          Chr( 190 ) + Chr( 205 ) + Chr( 212 ) + Chr( 179 ) )

 #endif /* _BOX_CH */
--- a/harbour/src/rtl/browse.prg
+++ b/harbour/src/rtl/browse.prg
@@ -81,12 +81,12 @@ FUNCTION Browse( nTop, nLeft, nBottom, nRight )
   cOldScreen := SaveScreen( nTop, nLeft, nBottom, nRight )

   hb_dispBox( nTop, nLeft, nBottom, nRight, B_DOUBLE_SINGLE )
-   hb_dispBox( nTop + 3, nLeft, nTop + 3, nLeft, chr( 198 ) )
-   hb_dispBox( nTop + 3, nRight, nTop + 3, nRight, chr( 181 ) )
+   hb_dispBox( nTop + 3, nLeft, nTop + 3, nLeft, Chr( 198 ) ) /* "╞" */
+   hb_dispBox( nTop + 3, nRight, nTop + 3, nRight, Chr( 181 ) ) /* "╡" */
   hb_dispOutAt( nTop + 1, nLeft + 1, Space( nRight - nLeft - 1 ) )

   oBrw := TBrowseDB( nTop + 2, nLeft + 1, nBottom - 1, nRight - 1 )
-   oBrw:HeadSep   := " " + Chr( 205 )
+   oBrw:HeadSep   := " " + Chr( 205 ) /* "═" */
   oBrw:SkipBlock := {| nRecs | Skipped( nRecs, lAppend ) }

   FOR n := 1 to FCount()
--- a/harbour/src/rtl/checkbox.prg
+++ b/harbour/src/rtl/checkbox.prg
@@ -108,7 +108,7 @@ CREATE CLASS CHECKBOX FUNCTION HBCheckBox
   VAR cMessage   INIT ""
   VAR nRow
   VAR bSBlock
-   VAR cStyle     INIT "[" + Chr( 251 ) + " ]"
+   VAR cStyle     INIT "[" + Chr( 251 ) + " ]" /* "[√]" */

   VAR nCursor

--- a/harbour/src/rtl/dbedit.prg
+++ b/harbour/src/rtl/dbedit.prg
@@ -97,8 +97,8 @@ FUNCTION DBEDIT( nTop, nLeft, nBottom, nRight, ;
   ENDIF

   oBrowse := TBrowseDb( nTop, nLeft, nBottom, nRight )
-   oBrowse:headSep   := iif( HB_ISSTRING( xHeadingSeparators ), xHeadingSeparators, Chr( 205 ) + Chr( 209 ) + Chr( 205 ) )
-   oBrowse:colSep    := iif( HB_ISSTRING( xColumnSeparators ), xColumnSeparators, " " + Chr( 179 ) + " " )
+   oBrowse:headSep   := iif( HB_ISSTRING( xHeadingSeparators ), xHeadingSeparators, Chr( 205 ) + Chr( 209 ) + Chr( 205 ) ) /* "═╤═" */
+   oBrowse:colSep    := iif( HB_ISSTRING( xColumnSeparators ), xColumnSeparators, " " + Chr( 179 ) + " " ) /* " │ " */
   oBrowse:footSep   := iif( HB_ISSTRING( xFootingSeparators ), xFootingSeparators, "" )
   oBrowse:skipBlock := {| nRecs | Skipped( nRecs, lAppend ) }
   oBrowse:autoLite  := .F. /* Set to .F. just like in CA-Cl*pper. [vszakats] */
--- a/harbour/src/rtl/listbox.prg
+++ b/harbour/src/rtl/listbox.prg
@@ -148,7 +148,7 @@ CREATE CLASS LISTBOX FUNCTION HBListBox
   VAR cMessage   INIT ""
   VAR nRight
   VAR bSBlock
-   VAR cStyle     INIT Chr( 31 )
+   VAR cStyle     INIT Chr( 31 ) /* "▼" */
   VAR cTextValue INIT ""
   VAR nTop
   VAR nTopItem   INIT 0
--- a/harbour/src/rtl/radiogrp.prg
+++ b/harbour/src/rtl/radiogrp.prg
@@ -52,6 +52,7 @@

 #include "hbclass.ch"

+#include "box.ch"
 #include "button.ch"
 #include "color.ch"
 #include "setcurs.ch"
@@ -114,11 +115,11 @@ CREATE CLASS RADIOGROUP FUNCTION HBRadioGroup
   VAR nCapCol
   VAR nCapRow
   VAR cCaption   INIT ""
-   VAR cColdBox   INIT Chr( 218 ) + Chr( 196 ) + Chr( 191 ) + Chr( 179 ) + Chr( 217 ) + Chr( 196 ) + Chr( 192 ) + Chr( 179 )
+   VAR cColdBox   INIT B_SINGLE
   VAR cColorSpec
   VAR bFBlock
   VAR lHasFocus  INIT .F.
-   VAR cHotBox    INIT Chr( 201 ) + Chr( 205 ) + Chr( 187 ) + Chr( 186 ) + Chr( 188 ) + Chr( 205 ) + Chr( 200 ) + Chr( 186 )
+   VAR cHotBox    INIT B_DOUBLE
   VAR nItemCount INIT 0
   VAR nLeft
   VAR cMessage   INIT ""
--- a/harbour/src/rtl/scrollbr.prg
+++ b/harbour/src/rtl/scrollbr.prg
@@ -391,13 +391,13 @@ METHOD CalcThumbPos() CLASS SCROLLBAR

 /* New definitions for better coding. These are screen codepage dependent,
   but can be changed with the setStyle method. */
-#define SB_UPARROW      Chr( 24 )
-#define SB_DNARROW      Chr( 25 )
-#define SB_RIGHTARROW   Chr( 26 )
-#define SB_LEFTARROW    Chr( 27 )
+#define SB_UPARROW      Chr( 24 ) /* "↑" */
+#define SB_DNARROW      Chr( 25 ) /* "↓" */
+#define SB_RIGHTARROW   Chr( 26 ) /* "→" */
+#define SB_LEFTARROW    Chr( 27 ) /* "←" */

-#define SB_THUMB        Chr( 176 )
-#define SB_TRACK        Chr( 178 )
+#define SB_THUMB        Chr( 176 ) /* "░" */
+#define SB_TRACK        Chr( 178 ) /* "▓" */

 METHOD New( nStart, nEnd, nOffset, bSBlock, nOrient ) CLASS SCROLLBAR

--- a/harbour/src/rtl/tmenuitm.prg
+++ b/harbour/src/rtl/tmenuitm.prg
@@ -90,7 +90,7 @@ CREATE CLASS MENUITEM FUNCTION HBMenuItem
   VAR nID
   VAR cMessage
   VAR nShortcut
-   VAR cStyle     INIT Chr( 251 ) + Chr( 16 )
+   VAR cStyle     INIT Chr( 251 ) + Chr( 16 ) /* "√►" */

 ENDCLASS