Mercurial > hg > xemacs-beta

comparison src/ui-byhand.c @ 5027:22179cd0fe15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Wed, 10 Feb 2010 07:25:19 -0600
parents ae48681c47fa
children ba07c880114a
comparison
equal deleted inserted replaced
5026:46cf825f6158 5027:22179cd0fe15
488 __generic_toolbar_callback (GtkWidget *UNUSED (item), gpointer user_data) 488 __generic_toolbar_callback (GtkWidget *UNUSED (item), gpointer user_data)
489 { 489 {
490 Lisp_Object callback; 490 Lisp_Object callback;
491 Lisp_Object lisp_user_data; 491 Lisp_Object lisp_user_data;
492 492
493 callback = VOID_TO_LISP (user_data); 493 callback = GET_LISP_FROM_VOID (user_data);
494 494
495 lisp_user_data = XCAR (callback); 495 lisp_user_data = XCAR (callback);
496 callback = XCDR (callback); 496 callback = XCDR (callback);
497 497
498 signal_special_gtk_user_event (Qnil, callback, lisp_user_data); 498 signal_special_gtk_user_event (Qnil, callback, lisp_user_data);
547 (char*) XSTRING_DATA (text), 547 (char*) XSTRING_DATA (text),
548 (char*) XSTRING_DATA (tooltip_text), 548 (char*) XSTRING_DATA (tooltip_text),
549 (char*) XSTRING_DATA (tooltip_private_text), 549 (char*) XSTRING_DATA (tooltip_private_text),
550 GTK_WIDGET (XGTK_OBJECT (icon)->object), 550 GTK_WIDGET (XGTK_OBJECT (icon)->object),
551 GTK_SIGNAL_FUNC (__generic_toolbar_callback), 551 GTK_SIGNAL_FUNC (__generic_toolbar_callback),
552 LISP_TO_VOID (callback)); 552 STORE_LISP_IN_VOID (callback));
553 } 553 }
554 else 554 else
555 { 555 {
556 w = gtk_toolbar_insert_item (GTK_TOOLBAR (XGTK_OBJECT (toolbar)->object), 556 w = gtk_toolbar_insert_item (GTK_TOOLBAR (XGTK_OBJECT (toolbar)->object),
557 (char*) XSTRING_DATA (text), 557 (char*) XSTRING_DATA (text),
558 (char*) XSTRING_DATA (tooltip_text), 558 (char*) XSTRING_DATA (tooltip_text),
559 (char*) XSTRING_DATA (tooltip_private_text), 559 (char*) XSTRING_DATA (tooltip_private_text),
560 GTK_WIDGET (XGTK_OBJECT (icon)->object), 560 GTK_WIDGET (XGTK_OBJECT (icon)->object),
561 GTK_SIGNAL_FUNC (__generic_toolbar_callback), 561 GTK_SIGNAL_FUNC (__generic_toolbar_callback),
562 LISP_TO_VOID (callback), 562 STORE_LISP_IN_VOID (callback),
563 XINT (position)); 563 XINT (position));
564 } 564 }
565 565
566 566
567 return (w ? build_gtk_object (GTK_OBJECT (w)) : Qnil); 567 return (w ? build_gtk_object (GTK_OBJECT (w)) : Qnil);
597 static void 597 static void
598 __emacs_gtk_ctree_recurse_internal (GtkCTree *ctree, GtkCTreeNode *node, gpointer user_data) 598 __emacs_gtk_ctree_recurse_internal (GtkCTree *ctree, GtkCTreeNode *node, gpointer user_data)
599 { 599 {
600 Lisp_Object closure; 600 Lisp_Object closure;
601 601
602 closure = VOID_TO_LISP (user_data); 602 closure = GET_LISP_FROM_VOID (user_data);
603 603
604 call3 (XCAR (closure), 604 call3 (XCAR (closure),
605 build_gtk_object (GTK_OBJECT (ctree)), 605 build_gtk_object (GTK_OBJECT (ctree)),
606 build_gtk_boxed (node, GTK_TYPE_CTREE_NODE), 606 build_gtk_boxed (node, GTK_TYPE_CTREE_NODE),
607 XCDR (closure)); 607 XCDR (closure));
664 { 664 {
665 (NILP (childfirstp) ? gtk_ctree_post_recursive : gtk_ctree_pre_recursive) 665 (NILP (childfirstp) ? gtk_ctree_post_recursive : gtk_ctree_pre_recursive)
666 (GTK_CTREE (XGTK_OBJECT (ctree)->object), 666 (GTK_CTREE (XGTK_OBJECT (ctree)->object),
667 NILP (node) ? NULL : (GtkCTreeNode *) XGTK_BOXED (node)->object, 667 NILP (node) ? NULL : (GtkCTreeNode *) XGTK_BOXED (node)->object,
668 __emacs_gtk_ctree_recurse_internal, 668 __emacs_gtk_ctree_recurse_internal,
669 LISP_TO_VOID (closure)); 669 STORE_LISP_IN_VOID (closure));
670 } 670 }
671 else 671 else
672 { 672 {
673 (NILP (childfirstp) ? gtk_ctree_post_recursive_to_depth : gtk_ctree_pre_recursive_to_depth) 673 (NILP (childfirstp) ? gtk_ctree_post_recursive_to_depth : gtk_ctree_pre_recursive_to_depth)
674 (GTK_CTREE (XGTK_OBJECT (ctree)->object), 674 (GTK_CTREE (XGTK_OBJECT (ctree)->object),
675 NILP (node) ? NULL : (GtkCTreeNode *) XGTK_BOXED (node)->object, 675 NILP (node) ? NULL : (GtkCTreeNode *) XGTK_BOXED (node)->object,
676 XINT (depth), 676 XINT (depth),
677 __emacs_gtk_ctree_recurse_internal, 677 __emacs_gtk_ctree_recurse_internal,
678 LISP_TO_VOID (closure)); 678 STORE_LISP_IN_VOID (closure));
679 } 679 }
680 680
681 UNGCPRO; 681 UNGCPRO;
682 return (Qnil); 682 return (Qnil);
683 } 683 }