Mercurial > emacs
view oldXMenu/AddPane.c @ 105563:159c68c1e3be
2009-10-11 Adrian Robert <Adrian.B.Robert@gmail.com>
Changes for 64-bit compile under Snow Leopard.
* nsfns.m (xw-color-values): Use CGFloat where appropriate.
* nsfont.m (ns_char_width): Replace deprecated call (suggested by
Erik Charlebois).
(ns_findfonts, nsfont_list_family): Use long format in printf, and
cast argument.
(nsfont_open): Use ns_char_width() everywhere.
(ns_uni_to_glyphs, NSGlyphStorage): Use NS[U]Integer where
appropriate.
* nsgui.h (NSPoint, NSSize) [!__OBJC__]: Define and use CGFloat.
* nsimage.m (EmacsImage-setXBMColor:,-getPixelAtX:Y:): Use CGFloat
where appropriate.
* nsmenu.m (EmacsMenu-addItemWithWidgetValue:): Use NSInteger
where appropriate.
(EmacsToolbar-addDisplayItemWithImage:idx:helpText:enabled:): Use
stringWithUTF8String.
(EmacsDialogPanel-initWithContentRect:styleMask:): Fix signature.
* nsterm.h (EmacsView, EmacsMenu, EmacsToolbar, EmacsTooltip): Add
formal protocol mention to inheritance.
[NS_HAVE_NSINTEGER]: Drop conditional and contents.
* nsterm.m (ns_color_to_lisp): Use CGFloat where appropriate. Fix
printf format.
(ns_query_color): Use CGFloat where appropriate.
(EmacsView<NSTextInput>, EmacsScroller): Fix method signatures.
(EmacsScroller-mouseDown:) Use long format in printf, and cast
argument.
author | Adrian Robert <Adrian.B.Robert@gmail.com> |
---|---|
date | Mon, 12 Oct 2009 00:28:30 +0000 |
parents | fec5e03aaf59 |
children | edf631bdbb7a ec58e5c426ef 5cc91198ffb2 |
line wrap: on
line source
/* Copyright Massachusetts Institute of Technology 1985 */ #include "copyright.h" /* * XMenu: MIT Project Athena, X Window system menu package * * XMenuAddPane - Adds a pane to an XMenu object. * * Author: Tony Della Fera, DEC * August, 1985 * */ #include <config.h> #include "XMenuInt.h" int XMenuAddPane(display, menu, label, active) Display *display; register XMenu *menu; /* Menu object to be modified. */ register char *label; /* Selection label. */ int active; /* Make selection active? */ { register XMPane *pane; /* Newly created pane. */ register XMSelect *select; /* Initial selection for the new pane. */ int label_length; /* Label length in characters. */ int label_width; /* Label width in pixels. */ /* * Check for NULL pointers! */ if (label == NULL) { _XMErrorCode = XME_ARG_BOUNDS; return(XM_FAILURE); } /* * Calloc the XMPane structure and the initial XMSelect. */ pane = (XMPane *)calloc(1, sizeof(XMPane)); if (pane == NULL) { _XMErrorCode = XME_CALLOC; return(XM_FAILURE); } select = (XMSelect *)calloc(1, sizeof(XMSelect)); if (select == NULL) { _XMErrorCode = XME_CALLOC; return(XM_FAILURE); } /* * Determine label size. */ label_length = strlen(label); label_width = XTextWidth(menu->p_fnt_info, label, label_length); /* * Set up the initial selection. * Values not explicitly set are zeroed by calloc. */ select->next = select; select->prev = select; select->type = SL_HEADER; select->serial = -1; select->parent_p = pane; /* * Fill the XMPane structure. * X and Y position are set to 0 since a recompute will follow. */ pane->type = PANE; pane->active = active; pane->serial = -1; pane->label = label; pane->label_width = label_width; pane->label_length = label_length; pane->s_list = select; /* * Insert the pane at the end of the pane list. */ emacs_insque(pane, menu->p_list->prev); /* * Update the pane count. */ menu->p_count++; /* * Schedule a recompute. */ menu->recompute = 1; /* * Return the pane number just added. */ _XMErrorCode = XME_NO_ERROR; return((menu->p_count - 1)); } /* arch-tag: 62a26021-f29d-48ba-96ef-3b6c4ebd6547 (do not change this comment) */