GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
/* Author: Jeff Peck, Sun Microsystems, Inc. <peck@sun.com>
Original ideas by David Kastan and Eric Negaard, SRI International
/*
* Emacs Lisp-Callable functions for sunwindows
*/
-#include "config.h"
+#include <config.h>
#include <stdio.h>
#include <errno.h>
String = Fcar(Pair);
CHECK_STRING(String, 0);
Value = Fcdr(Pair);
- if(XTYPE(Value) == Lisp_Symbol)
+ if (SYMBOLP (Value))
Value = XSYMBOL(Value)->value;
- if(XTYPE(Value) == Lisp_Vector) {
+ if (VECTORP (Value)) {
submenu = sun_menu_create (Value);
menu_item = menu_create_item
(MENU_RELEASE, MENU_PULLRIGHT_ITEM, XSTRING(String)->data, submenu, 0);
CHECK_GFX (Qnil);
- xpos = CtoSX (XWINDOW(window)->left + XINT(X_Position));
+ xpos = CtoSX (WINDOW_LEFT_MARGIN (XWINDOW (window)) + XINT(X_Position));
ypos = CtoSY (XWINDOW(window)->top + XINT(Y_Position));
#ifdef Menu_Base_Kludge
{static Lisp_Object symbol[2];
#ifdef Menu_Base_Kludge
/* i'm just too lazy to re-write this into C code */
/* so we will call this elisp function from C */
- sm_kludge_string = make_pure_string ("sm::menu-kludge", 15);
+ sm_kludge_string = make_pure_string ("sm::menu-kludge", 15, 15, 0);
#endif /* Menu_Base_Kludge */
defsubr(&Ssun_window_init);