From: Martin R. <ru...@us...> - 2010-04-26 15:33:56
|
Update of /cvsroot/foo/fooelk/lib/xwidgets/motif In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7881/lib/xwidgets/motif Modified Files: list.d row-column.d scroll-bar.d support.d toggle-btn.d Log Message: equiv to revision level r273 of original elk Index: row-column.d =================================================================== RCS file: /cvsroot/foo/fooelk/lib/xwidgets/motif/row-column.d,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** row-column.d 6 Aug 2004 20:56:43 -0000 1.1.1.1 --- row-column.d 26 Apr 2010 15:33:48 -0000 1.2 *************** *** 55,59 **** XtGetValues (popup, &a, 1); if (ep->button != b) ! return; XmMenuPosition (popup, ep); XtManageChild (popup); --- 55,59 ---- XtGetValues (popup, &a, 1); if (ep->button != b) ! return; XmMenuPosition (popup, ep); XtManageChild (popup); *************** *** 84,92 **** XtGetValues (WIDGET(w)->widget, &a, 1); if (client_data) ! XtRemoveEventHandler (WIDGET(w)->widget, ButtonPressMask, 0, ! Post_Handler, client_data); client_data = (XtPointer)WIDGET(m)->widget; XtAddEventHandler (WIDGET(w)->widget, ButtonPressMask, 0, ! Post_Handler, client_data); client_data = (XtPointer)WIDGET(m)->widget; XtSetValues (WIDGET(w)->widget, &a, 1); --- 84,92 ---- XtGetValues (WIDGET(w)->widget, &a, 1); if (client_data) ! XtRemoveEventHandler (WIDGET(w)->widget, ButtonPressMask, 0, ! Post_Handler, client_data); client_data = (XtPointer)WIDGET(m)->widget; XtAddEventHandler (WIDGET(w)->widget, ButtonPressMask, 0, ! Post_Handler, client_data); client_data = (XtPointer)WIDGET(m)->widget; XtSetValues (WIDGET(w)->widget, &a, 1); Index: list.d =================================================================== RCS file: /cvsroot/foo/fooelk/lib/xwidgets/motif/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 *************** *** 42,48 **** GC_Link2 (ret, tail); for ( ; len > 0; len--, tail = Cdr (tail)) { ! if (!XmStringGetLtoR (*tab++, XmSTRING_DEFAULT_CHARSET, &text)) ! text = \"\"; ! Car (tail) = Make_String (text, strlen (text)); } GC_Unlink; --- 42,48 ---- GC_Link2 (ret, tail); for ( ; len > 0; len--, tail = Cdr (tail)) { ! if (!XmStringGetLtoR (*tab++, XmSTRING_DEFAULT_CHARSET, &text)) ! text = \"\"; ! Car (tail) = Make_String (text, strlen (text)); } GC_Unlink; *************** *** 67,82 **** if (!XmStringGetLtoR (p->item, XmSTRING_DEFAULT_CHARSET, &text)) ! text = \"\"; ret = s = Make_String (text, strlen (text)); GC_Link2 (ret, s); ret = Cons (ret, Null); if (p->reason == XmCR_MULTIPLE_SELECT ! || p->reason == XmCR_EXTENDED_SELECT) { ! s = String_Table_To_Scheme (p->selected_items, p->selected_item_count); ! ret = Cons (s, ret); ! s = Bits_To_Symbols ((unsigned long)p->selection_type, 0, Type_Syms); ! ret = Cons (s, ret); } else { ! ret = Cons (Make_Integer (p->item_position), ret); } s = Get_Any_CB ((XmAnyCallbackStruct *)p); --- 67,82 ---- if (!XmStringGetLtoR (p->item, XmSTRING_DEFAULT_CHARSET, &text)) ! text = \"\"; ret = s = Make_String (text, strlen (text)); GC_Link2 (ret, s); ret = Cons (ret, Null); if (p->reason == XmCR_MULTIPLE_SELECT ! || p->reason == XmCR_EXTENDED_SELECT) { ! s = String_Table_To_Scheme (p->selected_items, p->selected_item_count); ! ret = Cons (s, ret); ! s = Bits_To_Symbols ((unsigned long)p->selection_type, 0, Type_Syms); ! ret = Cons (s, ret); } else { ! ret = Cons (Make_Integer (p->item_position), ret); } s = Get_Any_CB ((XmAnyCallbackStruct *)p); Index: toggle-btn.d =================================================================== RCS file: /cvsroot/foo/fooelk/lib/xwidgets/motif/toggle-btn.d,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** toggle-btn.d 6 Aug 2004 20:56:43 -0000 1.1.1.1 --- toggle-btn.d 26 Apr 2010 15:33:48 -0000 1.2 *************** *** 50,52 **** toggle-button-callback->scheme) (c->scheme 'callback:toggle-button-gadget-valueChangedCallback ! toggle-button-callback->scheme) --- 50,52 ---- toggle-button-callback->scheme) (c->scheme 'callback:toggle-button-gadget-valueChangedCallback ! toggle-button-callback->scheme) Index: support.d =================================================================== RCS file: /cvsroot/foo/fooelk/lib/xwidgets/motif/support.d,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** support.d 10 Aug 2004 02:28:52 -0000 1.2 --- support.d 26 Apr 2010 15:33:48 -0000 1.3 *************** *** 90,94 **** } ret = Cons (Bits_To_Symbols ((unsigned long)p->reason, 0, Reason_Syms), ! ret); GC_Unlink; return ret; --- 90,94 ---- } ret = Cons (Bits_To_Symbols ((unsigned long)p->reason, 0, Reason_Syms), ! ret); GC_Unlink; return ret; *************** *** 104,108 **** if (!XmStringGetLtoR (p->value, XmSTRING_DEFAULT_CHARSET, &text)) ! text = \"\"; ret = s = Make_String (text, strlen (text)); GC_Link2 (ret, s); --- 104,108 ---- if (!XmStringGetLtoR (p->value, XmSTRING_DEFAULT_CHARSET, &text)) ! text = \"\"; ret = s = Make_String (text, strlen (text)); GC_Link2 (ret, s); *************** *** 125,135 **** tab = (XmString *)XtMalloc (Get_Integer (P_Length (x)) ! * sizeof (XmString)); /* tab is never freed since the converter must return a new address * each time it is called. */ for (t = x; TYPE(t) == T_Pair; t = Cdr (t)) { ! Get_Strsym_Stack (Car (t), s); ! tab[i++] = XmStringCreate (s, XmSTRING_DEFAULT_CHARSET); } Alloca_End; --- 125,135 ---- tab = (XmString *)XtMalloc (Get_Integer (P_Length (x)) ! * sizeof (XmString)); /* tab is never freed since the converter must return a new address * each time it is called. */ for (t = x; TYPE(t) == T_Pair; t = Cdr (t)) { ! Get_Strsym_Stack (Car (t), s); ! tab[i++] = XmStringCreate (s, XmSTRING_DEFAULT_CHARSET); } Alloca_End; *************** *** 196,200 **** " char *text; if (!XmStringGetLtoR ((XmString)x, XmSTRING_DEFAULT_CHARSET, &text)) ! text = \"\"; return Make_String (text, strlen (text));") --- 196,200 ---- " char *text; if (!XmStringGetLtoR ((XmString)x, XmSTRING_DEFAULT_CHARSET, &text)) ! text = \"\"; return Make_String (text, strlen (text));") Index: scroll-bar.d =================================================================== RCS file: /cvsroot/foo/fooelk/lib/xwidgets/motif/scroll-bar.d,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** scroll-bar.d 6 Aug 2004 20:56:43 -0000 1.1.1.1 --- scroll-bar.d 26 Apr 2010 15:33:48 -0000 1.2 *************** *** 63,72 **** (c->scheme 'callback:scroll-bar-incrementCallback scrollbar-callback->scheme) (c->scheme 'callback:scroll-bar-pageDecrementCallback ! scrollbar-callback->scheme) (c->scheme 'callback:scroll-bar-pageIncrementCallback ! scrollbar-callback->scheme) (c->scheme 'callback:scroll-bar-dragCallback scrollbar-callback->scheme) (c->scheme 'callback:scroll-bar-toTopCallback scrollbar-callback->scheme) (c->scheme 'callback:scroll-bar-toBottomCallback scrollbar-callback->scheme) (c->scheme 'callback:scroll-bar-valueChangedCallback ! scrollbar-callback->scheme) --- 63,72 ---- (c->scheme 'callback:scroll-bar-incrementCallback scrollbar-callback->scheme) (c->scheme 'callback:scroll-bar-pageDecrementCallback ! scrollbar-callback->scheme) (c->scheme 'callback:scroll-bar-pageIncrementCallback ! scrollbar-callback->scheme) (c->scheme 'callback:scroll-bar-dragCallback scrollbar-callback->scheme) (c->scheme 'callback:scroll-bar-toTopCallback scrollbar-callback->scheme) (c->scheme 'callback:scroll-bar-toBottomCallback scrollbar-callback->scheme) (c->scheme 'callback:scroll-bar-valueChangedCallback ! scrollbar-callback->scheme) |