From 4c8cdf9198b34aaddb1e660d0e8adedaff950750 Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Fri, 26 May 2000 08:34:17 +0000
Subject: Ajout d'une spec de dimensionnement de field "label".

---
 generic/Attrs.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'generic/Attrs.c')

diff --git a/generic/Attrs.c b/generic/Attrs.c
index 2e58f67..bfd155c 100644
--- a/generic/Attrs.c
+++ b/generic/Attrs.c
@@ -115,6 +115,8 @@ CharToDim(char	dim)
     return LF_DIM_ICON;
   case 'a':
     return LF_DIM_AUTO;
+  case 'l':
+    return LF_DIM_LABEL;
   case 'x':
   default:
     return LF_DIM_PIXEL;
@@ -200,7 +202,8 @@ LabelFormatCreate(Tcl_Interp	*interp,
   if (!*ptr) {
     goto lf_error_syn;
   }
-  if ((*ptr != 'x') && (*ptr != 'f') && (*ptr != 'i') && (*ptr != 'a')) {
+  if ((*ptr != 'x') && (*ptr != 'f') && (*ptr != 'i') &&
+      (*ptr != 'a') && (*ptr != 'l')) {
     c_width = (ZnDim) strtod(ptr, &next_ptr);
     if ((ptr == next_ptr) || (*next_ptr != 'x')) {
     lf_error_syn:
@@ -243,7 +246,8 @@ LabelFormatCreate(Tcl_Interp	*interp,
   field_struct.x_spec = field_struct.y_spec = 0;
   field_struct.x_attach = field_struct.y_attach = LF_ATTACH_PIXEL;
   field_struct.x_dim = field_struct.y_dim = LF_DIM_PIXEL;
-  if ((*ptr == 'x') || (*ptr == 'f') || (*ptr == 'i') || (*ptr == 'a')) {
+  if ((*ptr == 'x') || (*ptr == 'f') || (*ptr == 'i') ||
+      (*ptr == 'a') || (*ptr == 'l')) {
     num_tok = sscanf(ptr, "%c%d%c%d%n", &x_char, &width,
 		     &y_char, &height, &index);
     if (num_tok != 4) {
@@ -272,7 +276,7 @@ LabelFormatCreate(Tcl_Interp	*interp,
       ptr += index;
     }
     else if (!*ptr || (field_index != 0)) {
-      /* An incomplete field spec is an error if there is several fields. */
+      /* An incomplete field spec is an error if there are several fields. */
       Tcl_AppendResult(interp, "incomplete field in label format: \"",
 		       ptr-index, "\"", NULL);
       goto lf_error;		
-- 
cgit v1.1