Mercurial > hg > xemacs-beta
diff src/gui.h @ 440:8de8e3f6228a r21-2-28
Import from CVS: tag r21-2-28
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 11:33:38 +0200 |
| parents | a5df635868b2 |
| children | abe6d1db359e |
line wrap: on
line diff
--- a/src/gui.h Mon Aug 13 11:32:27 2007 +0200 +++ b/src/gui.h Mon Aug 13 11:33:38 2007 +0200 @@ -24,8 +24,8 @@ /* 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,14 +36,6 @@ /* 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 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 @@ -62,6 +54,13 @@ 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; @@ -95,4 +94,4 @@ #define MAX_MENUITEM_LENGTH 128 -#endif /* _XEMACS_GUI_H_ */ +#endif /* INCLUDED_gui_h_ */