X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fgui-x.h;h=032aa4637f0b9e264368cd6386370dc3f86baab8;hb=2003d10ed3d849e2e973337bb4adf43fa769e6ae;hp=ed7e4d5dec96430f488a9ed94f37684ad33e8dc3;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git.1

diff --git a/src/gui-x.h b/src/gui-x.h
index ed7e4d5..032aa46 100644
--- a/src/gui-x.h
+++ b/src/gui-x.h
@@ -1,6 +1,6 @@
 /* General GUI code -- X-specific header file.
    Copyright (C) 1993, 1994 Free Software Foundation, Inc.
-   Copyright (C) 1996 Ben Wing.
+   Copyright (C) 1996, 2000 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -21,8 +21,10 @@ Boston, MA 02111-1307, USA.  */
 
 /* Synched up with: Not in FSF. */
 
-#ifndef _XEMACS_XLWLIB_H_
-#define _XEMACS_XLWLIB_H_
+/* This file Mule-ized by Ben Wing, 7-8-00. */
+
+#ifndef INCLUDED_gui_x_h_
+#define INCLUDED_gui_x_h_
 
 #include "../lwlib/lwlib.h"
 
@@ -30,8 +32,6 @@ widget_value *xmalloc_widget_value (void);
 
 LWLIB_ID new_lwlib_id (void);
 
-#ifdef HAVE_POPUPS
-
 /* Each frame has one of these, and they are also contained in
    Vpopup_callbacks.
    It doesn't really need to be an lrecord (it's not lisp-accessible)
@@ -62,7 +62,6 @@ DECLARE_LRECORD (popup_data, struct popup_data);
 #define XPOPUP_DATA(x) XRECORD (x, popup_data, struct popup_data)
 #define XSETPOPUP_DATA(x, p) XSETRECORD (x, p, popup_data)
 #define POPUP_DATAP(x) RECORDP (x, popup_data)
-#define GC_POPUP_DATAP(x) GC_RECORDP (x, popup_data)
 #define CHECK_POPUP_DATA(x) CHECK_RECORD (x, popup_data)
 
 void gcpro_popup_callbacks (LWLIB_ID id);
@@ -71,12 +70,14 @@ int popup_handled_p (LWLIB_ID id);
 void free_popup_widget_value_tree (widget_value *wv);
 void popup_selection_callback (Widget widget, LWLIB_ID ignored_id,
 			       XtPointer client_data);
-int button_item_to_widget_value (Lisp_Object desc, widget_value *wv,
-				 int allow_text_field_p, int no_keys_p);
-Lisp_Object menu_name_to_accelerator (char *name);
-char *menu_separator_style (CONST char *s);
+Extbyte *add_accel_and_to_external (Lisp_Object string);
+int button_item_to_widget_value (Lisp_Object gui_object_instance,
+				 Lisp_Object gui_item, widget_value *wv,
+				 int allow_text_field_p, int no_keys_p,
+				 int menu_entry_p, int accel_p);
+widget_value * gui_items_to_widget_values (Lisp_Object gui_object_instance,
+					   Lisp_Object items, int accel_p);
+Extbyte *menu_separator_style_and_to_external (const Bufbyte *s);
 Lisp_Object widget_value_unwind (Lisp_Object closure);
 
-#endif /* HAVE_POPUPS */
-
-#endif /* _XEMACS_XLWLIB_H_ */
+#endif /* INCLUDED_gui_x_h_ */