From: Martin R. <ru...@us...> - 2010-04-26 15:33:55
|
Update of /cvsroot/foo/fooelk/lib/xwidgets/xaw In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7881/lib/xwidgets/xaw Modified Files: grip.d list.d paned.d porthole.d simplemenu.d stripchart.d Log Message: equiv to revision level r273 of original elk Index: list.d =================================================================== RCS file: /cvsroot/foo/fooelk/lib/xwidgets/xaw/list.d,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** list.d 6 Aug 2004 20:56:43 -0000 1.1.1.1 --- list.d 26 Apr 2010 15:33:48 -0000 1.2 *************** *** 41,46 **** l = (char **)XtMalloc ((n+1) * sizeof (char *)); for (i = 0; i < n; i++, x = Cdr (x)) { ! Get_Strsym_Stack (Car (x), s); ! l[i] = XtNewString (s); } l[i] = 0; --- 41,46 ---- l = (char **)XtMalloc ((n+1) * sizeof (char *)); for (i = 0; i < n; i++, x = Cdr (x)) { ! Get_Strsym_Stack (Car (x), s); ! l[i] = XtNewString (s); } l[i] = 0; *************** *** 56,60 **** " XawListReturnStruct *p = (XawListReturnStruct *)x; return Cons (Make_String (p->string, strlen (p->string)), ! Make_Integer (p->list_index));") (scheme->c 'list-list --- 56,60 ---- " XawListReturnStruct *p = (XawListReturnStruct *)x; return Cons (Make_String (p->string, strlen (p->string)), ! Make_Integer (p->list_index));") (scheme->c 'list-list *************** *** 83,87 **** p = XawListShowCurrent (WIDGET(w)->widget); if (p->list_index == XAW_LIST_NONE) ! return False; return Cons (Make_String (p->string, strlen (p->string)), ! Make_Integer (p->list_index));") --- 83,87 ---- p = XawListShowCurrent (WIDGET(w)->widget); if (p->list_index == XAW_LIST_NONE) ! return False; return Cons (Make_String (p->string, strlen (p->string)), ! Make_Integer (p->list_index));") Index: simplemenu.d =================================================================== RCS file: /cvsroot/foo/fooelk/lib/xwidgets/xaw/simplemenu.d,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** simplemenu.d 6 Aug 2004 20:56:43 -0000 1.1.1.1 --- simplemenu.d 26 Apr 2010 15:33:48 -0000 1.2 *************** *** 40,44 **** " Check_Widget_Class (w, simpleMenuWidgetClass); return ! Make_Widget_Foreign (XawSimpleMenuGetActiveEntry (WIDGET(w)->widget));") (define-primitive 'simplemenu-clear-active-entry '(w) --- 40,44 ---- " Check_Widget_Class (w, simpleMenuWidgetClass); return ! Make_Widget_Foreign (XawSimpleMenuGetActiveEntry (WIDGET(w)->widget));") (define-primitive 'simplemenu-clear-active-entry '(w) Index: grip.d =================================================================== RCS file: /cvsroot/foo/fooelk/lib/xwidgets/xaw/grip.d,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** grip.d 6 Aug 2004 20:56:43 -0000 1.1.1.1 --- grip.d 26 Apr 2010 15:33:48 -0000 1.2 *************** *** 47,54 **** t = P_Make_List (Make_Integer (p->num_params), Null); for (i = 0, Cdr (ret) = t; i < p->num_params; i++, t = Cdr (t)) { ! Object s; ! ! s = Make_String (p->params[i], strlen (p->params[i])); ! Car (t) = s; } GC_Unlink; --- 47,54 ---- t = P_Make_List (Make_Integer (p->num_params), Null); for (i = 0, Cdr (ret) = t; i < p->num_params; i++, t = Cdr (t)) { ! Object s; ! ! s = Make_String (p->params[i], strlen (p->params[i])); ! Car (t) = s; } GC_Unlink; Index: paned.d =================================================================== RCS file: /cvsroot/foo/fooelk/lib/xwidgets/xaw/paned.d,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** paned.d 6 Aug 2004 20:56:43 -0000 1.1.1.1 --- paned.d 26 Apr 2010 15:33:48 -0000 1.2 *************** *** 41,45 **** " Check_Widget (w); XawPanedSetMinMax (WIDGET(w)->widget, Get_Integer (min), ! Get_Integer (max)); return Void;") --- 41,45 ---- " Check_Widget (w); XawPanedSetMinMax (WIDGET(w)->widget, Get_Integer (min), ! Get_Integer (max)); return Void;") Index: porthole.d =================================================================== RCS file: /cvsroot/foo/fooelk/lib/xwidgets/xaw/porthole.d,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** porthole.d 6 Aug 2004 20:56:43 -0000 1.1.1.1 --- porthole.d 26 Apr 2010 15:33:48 -0000 1.2 *************** *** 60,64 **** ret = Cons (Make_Integer (p->slider_x), ret); ret = Cons (Bits_To_Symbols ((unsigned long)p->changed, 1, Panner_Syms), ! ret); GC_Unlink; return ret;") --- 60,64 ---- ret = Cons (Make_Integer (p->slider_x), ret); ret = Cons (Bits_To_Symbols ((unsigned long)p->changed, 1, Panner_Syms), ! ret); GC_Unlink; return ret;") Index: stripchart.d =================================================================== RCS file: /cvsroot/foo/fooelk/lib/xwidgets/xaw/stripchart.d,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** stripchart.d 6 Aug 2004 20:56:43 -0000 1.1.1.1 --- stripchart.d 26 Apr 2010 15:33:48 -0000 1.2 *************** *** 56,60 **** XtGetValues (WIDGET(w)->widget, a, 1); if (c[0].callback) ! Primitive_Error (\"stripchart already has a sampler\"); i = Register_Function (p); XtAddCallback (WIDGET(w)->widget, XtNgetValue, Get_Value, (XtPointer)i); --- 56,60 ---- XtGetValues (WIDGET(w)->widget, a, 1); if (c[0].callback) ! Primitive_Error (\"stripchart already has a sampler\"); i = Register_Function (p); XtAddCallback (WIDGET(w)->widget, XtNgetValue, Get_Value, (XtPointer)i); *************** *** 66,70 **** w = (Widget)Use_Id (i, 's'); XtRemoveCallback (w, XtNgetValue, Get_Value, ! (XtPointer)IDENTIFIER(i)->num); Deregister_Function (IDENTIFIER(i)->num); return Void;") --- 66,70 ---- w = (Widget)Use_Id (i, 's'); XtRemoveCallback (w, XtNgetValue, Get_Value, ! (XtPointer)IDENTIFIER(i)->num); Deregister_Function (IDENTIFIER(i)->num); return Void;") |