X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fgui-x.h;h=d507f69b61ef77359d915ed418fb620bd883b80f;hb=9816585ded614fa87be5a2ecfda6dc16c60beb2c;hp=bb6fa10808dea66e7aa04f7089350b4c60337d22;hpb=376658ea71d16dced8acff36c3e385ac3738d868;p=chise%2Fxemacs-chise.git-

diff --git a/src/gui-x.h b/src/gui-x.h
index bb6fa10..d507f69 100644
--- a/src/gui-x.h
+++ b/src/gui-x.h
@@ -21,8 +21,8 @@ Boston, MA 02111-1307, USA.  */
 
 /* Synched up with: Not in FSF. */
 
-#ifndef _XEMACS_XLWLIB_H_
-#define _XEMACS_XLWLIB_H_
+#ifndef INCLUDED_gui_x_h_
+#define INCLUDED_gui_x_h_
 
 #include "../lwlib/lwlib.h"
 
@@ -68,11 +68,15 @@ 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);
-widget_value * gui_items_to_widget_values (Lisp_Object items);
+char *strdup_and_add_accel (char *name);
+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);
+widget_value * gui_items_to_widget_values (Lisp_Object gui_object_instance,
+					   Lisp_Object items);
 Lisp_Object menu_name_to_accelerator (char *name);
-char *menu_separator_style (CONST char *s);
+char *menu_separator_style (const char *s);
 Lisp_Object widget_value_unwind (Lisp_Object closure);
 
-#endif /* _XEMACS_XLWLIB_H_ */
+#endif /* INCLUDED_gui_x_h_ */