Mercurial > hg > xemacs-beta
comparison src/ui-byhand.c @ 2054:91d4c8c65a0f
[xemacs-hg @ 2004-05-02 04:06:51 by malcolmp]
Fix warnings and errors when building GTK using C++ and --use-union-type.
author | malcolmp |
---|---|
date | Sun, 02 May 2004 04:07:01 +0000 |
parents | e7ee5f8bde58 |
children | 04bc9d2f42c7 |
comparison
equal
deleted
inserted
replaced
2053:11e709117623 | 2054:91d4c8c65a0f |
---|---|
525 | 525 |
526 if (NILP (position)) | 526 if (NILP (position)) |
527 { | 527 { |
528 w = (NILP (prepend_p) ? gtk_toolbar_append_item : gtk_toolbar_prepend_item) | 528 w = (NILP (prepend_p) ? gtk_toolbar_append_item : gtk_toolbar_prepend_item) |
529 (GTK_TOOLBAR (XGTK_OBJECT (toolbar)->object), | 529 (GTK_TOOLBAR (XGTK_OBJECT (toolbar)->object), |
530 XSTRING_DATA (text), | 530 (char*) XSTRING_DATA (text), |
531 XSTRING_DATA (tooltip_text), | 531 (char*) XSTRING_DATA (tooltip_text), |
532 XSTRING_DATA (tooltip_private_text), | 532 (char*) XSTRING_DATA (tooltip_private_text), |
533 GTK_WIDGET (XGTK_OBJECT (icon)->object), | 533 GTK_WIDGET (XGTK_OBJECT (icon)->object), |
534 GTK_SIGNAL_FUNC (__generic_toolbar_callback), | 534 GTK_SIGNAL_FUNC (__generic_toolbar_callback), |
535 LISP_TO_VOID (callback)); | 535 LISP_TO_VOID (callback)); |
536 } | 536 } |
537 else | 537 else |
538 { | 538 { |
539 w = gtk_toolbar_insert_item (GTK_TOOLBAR (XGTK_OBJECT (toolbar)->object), | 539 w = gtk_toolbar_insert_item (GTK_TOOLBAR (XGTK_OBJECT (toolbar)->object), |
540 XSTRING_DATA (text), | 540 (char*) XSTRING_DATA (text), |
541 XSTRING_DATA (tooltip_text), | 541 (char*) XSTRING_DATA (tooltip_text), |
542 XSTRING_DATA (tooltip_private_text), | 542 (char*) XSTRING_DATA (tooltip_private_text), |
543 GTK_WIDGET (XGTK_OBJECT (icon)->object), | 543 GTK_WIDGET (XGTK_OBJECT (icon)->object), |
544 GTK_SIGNAL_FUNC (__generic_toolbar_callback), | 544 GTK_SIGNAL_FUNC (__generic_toolbar_callback), |
545 LISP_TO_VOID (callback), | 545 LISP_TO_VOID (callback), |
546 XINT (position)); | 546 XINT (position)); |
547 } | 547 } |