* menu.h: New file.

* menu.c: Include it.
* xmenu.c: Likewise.
* Makefile.in: Update dependencies.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0580e59f31808cbaeb646c4e92f4950f5597c075..5c5e673f2c0733367fb9a1c54a9096f9d097b772 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-11  Andreas Schwab  <schwab@suse.de>
+
+       * menu.h: New file.
+       * menu.c: Include it.
+       * xmenu.c: Likewise.
+       * Makefile.in: Update dependencies.
+
 2008-07-11  Kenichi Handa  <handa@m17n.org>
 
        * fontset.c (fontset_from_font): Cancel the previous change.

diff --git a/src/Makefile.in b/src/Makefile.in
index 29a4881d01223baa920e4aeeb7fb260e43ad2432..9fc66979f25378a3706b30ca479bb1b21aef9f36 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1176,10 +1176,11 @@ xftfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \
 ftxfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \
    font.h $(config_h)
 menu.o: menu.c lisp.h keyboard.h keymap.h frame.h termhooks.h blockinput.h \
-   dispextern.h $(srcdir)/../lwlib/lwlib.h xterm.h gtkutil.h $(config_h)
+   dispextern.h $(srcdir)/../lwlib/lwlib.h xterm.h gtkutil.h menu.h \
+   $(config_h)
 xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \
    charset.h keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h \
-   systime.h gtkutil.h msdos.h coding.h $(config_h)
+   systime.h gtkutil.h msdos.h coding.h menu.h $(config_h)
 xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \
    dispextern.h frame.h disptab.h blockinput.h atimer.h systime.h syssignal.h \
    keyboard.h emacs-icon.h character.h charset.h ccl.h fontset.h composite.h \

diff --git a/src/menu.c b/src/menu.c
index 52c721891f7a6e728970002943d44009963dfe00..e8bc8de1bfcd708b9bc4210416e223a120475adb 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
@@ -47,6 +47,7 @@ extern AppendMenuW_Proc unicode_append_menu;
 
 #endif /* HAVE_NTGUI  */
 
+#include "menu.h"
 
 /* Define HAVE_BOXES if menus can handle radio and toggle buttons.  */
 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI)

diff --git a/src/menu.h b/src/menu.h
new file mode 100644 (file)
index 0000000..ed552e8
--- /dev/null
+++ b/src/menu.h
@@ -0,0 +1,36 @@
+/* Functions to manipulate menus.
+   Copyright (C) 2008 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+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 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef MENU_H
+#define MENU_H
+
+extern void init_menu_items P_ ((void));
+extern void finish_menu_items P_ ((void));
+extern void discard_menu_items P_ ((void));
+extern void save_menu_items P_ ((void));
+extern int parse_single_submenu P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
+extern void keymap_panes P_ ((Lisp_Object *, int, int));
+extern void list_of_panes P_ ((Lisp_Object));
+#if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI)
+extern void free_menubar_widget_value_tree P_ ((widget_value *));
+extern void update_submenu_strings P_ ((widget_value *));
+extern void find_and_call_menu_selection P_ ((FRAME_PTR, EMACS_INT,
+                                             Lisp_Object, void *));
+#endif
+
+#endif /* MENU_H */

diff --git a/src/xmenu.c b/src/xmenu.c
index bba202e4504acf64f11499605f36055311022c7e..ca0bcdf7d23580d30816e7160774f1608299d8f8 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -94,6 +94,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif /* not USE_X_TOOLKIT */
 #endif /* HAVE_X_WINDOWS */
 
+#ifdef USE_GTK
+#include "gtkutil.h"
+#endif
+
+#include "menu.h"
+
 #ifndef TRUE
 #define TRUE 1
 #define FALSE 0
@@ -125,7 +131,6 @@ static void popup_get_selection P_ ((XEvent *, struct x_display_info *,
 #endif /* USE_X_TOOLKIT */
 
 #ifdef USE_GTK
-#include "gtkutil.h"
 extern void set_frame_menubar P_ ((FRAME_PTR, int, int));
 static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, Lisp_Object,
                                     char **));