update.

[chise/xemacs-chise.git-] / src / gui.h

diff --git a/src/gui.h b/src/gui.h
index 904bd96..20b0d5a 100644 (file)
--- a/src/gui.h
+++ b/src/gui.h
@@ -24,8 +24,8 @@ Boston, MA 02111-1307, USA.  */
 
 /* Written by kkm on 12/24/97 */
 
-#ifndef _XEMACS_GUI_H_
-#define _XEMACS_GUI_H_
+#ifndef INCLUDED_gui_h_
+#define INCLUDED_gui_h_
 
 int separator_string_p (CONST char *s);
 void get_gui_callback (Lisp_Object, Lisp_Object *, Lisp_Object *);
@@ -36,15 +36,6 @@ extern int popup_up_p;
 /*                     Image Instance Object                           */
 /************************************************************************/
 
-DECLARE_LRECORD (gui_item, struct Lisp_Gui_Item);
-#define XGUI_ITEM(x) \
-  XRECORD (x, gui_item, struct Lisp_Gui_Item)
-#define XSETGUI_ITEM(x, p) XSETRECORD (x, p, gui_item)
-#define GUI_ITEMP(x) RECORDP (x, gui_item)
-#define GC_GUI_ITEMP(x) GC_RECORDP (x, gui_item)
-#define CHECK_GUI_ITEM(x) CHECK_RECORD (x, gui_item)
-#define CONCHECK_GUI_ITEM(x) CONCHECK_RECORD (x, gui_item)
-
 /* This structure describes gui button,
    menu item or submenu properties */
 struct Lisp_Gui_Item
@@ -63,6 +54,13 @@ struct Lisp_Gui_Item
   Lisp_Object accelerator;     /* Char or Symbol  */
 };
 
+DECLARE_LRECORD (gui_item, Lisp_Gui_Item);
+#define XGUI_ITEM(x) XRECORD (x, gui_item, Lisp_Gui_Item)
+#define XSETGUI_ITEM(x, p) XSETRECORD (x, p, gui_item)
+#define GUI_ITEMP(x) RECORDP (x, gui_item)
+#define CHECK_GUI_ITEM(x) CHECK_RECORD (x, gui_item)
+#define CONCHECK_GUI_ITEM(x) CONCHECK_RECORD (x, gui_item)
+
 extern Lisp_Object Q_accelerator, Q_active, Q_config, Q_filter, Q_included;
 extern Lisp_Object Q_keys, Q_selected, Q_suffix, Qradio, Qtoggle;
 extern Lisp_Object Q_key_sequence, Q_label, Q_callback;
@@ -72,6 +70,7 @@ void gui_item_add_keyval_pair (Lisp_Object,
                               Error_behavior errb);
 Lisp_Object gui_parse_item_keywords (Lisp_Object item);
 Lisp_Object gui_parse_item_keywords_no_errors (Lisp_Object item);
+void gui_add_item_keywords_to_plist (Lisp_Object plist, Lisp_Object gui_item);
 int  gui_item_active_p (Lisp_Object);
 int  gui_item_selected_p (Lisp_Object);
 int  gui_item_included_p (Lisp_Object, Lisp_Object into);
@@ -83,8 +82,9 @@ unsigned int gui_item_display_flush_left  (Lisp_Object pgui_item,
 unsigned int gui_item_display_flush_right (Lisp_Object gui_item,
                                           char* buf, Bytecount buf_len);
 
-Lisp_Object allocate_gui_item ();
+Lisp_Object allocate_gui_item (void);
 void gui_item_init (Lisp_Object gui_item);
+Lisp_Object parse_gui_item_tree_children (Lisp_Object list);
 
 /* this is mswindows biased but reasonably safe I think */
 #define GUI_ITEM_ID_SLOTS 8
@@ -94,4 +94,4 @@ void gui_item_init (Lisp_Object gui_item);
 
 #define MAX_MENUITEM_LENGTH 128
 
-#endif /* _XEMACS_GUI_H_ */
+#endif /* INCLUDED_gui_h_ */