aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew Innes2000-08-22 23:37:05 +0000
committerAndrew Innes2000-08-22 23:37:05 +0000
commit15d36dee8f0b3c402466adaa3ef231b3b02086b3 (patch)
treeb31373beb8e689338526b7aa7a947aef122028e3 /src
parent690e96a3102395d359e06576cf4c4c7a38b13794 (diff)
downloademacs-15d36dee8f0b3c402466adaa3ef231b3b02086b3.tar.gz
emacs-15d36dee8f0b3c402466adaa3ef231b3b02086b3.zip
Include keyboard.h before frame.h. Fix compile
warnings.
Diffstat (limited to 'src')
-rw-r--r--src/w32menu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/w32menu.c b/src/w32menu.c
index ac740671c81..257722550ab 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -24,9 +24,9 @@ Boston, MA 02111-1307, USA. */
24#include <stdio.h> 24#include <stdio.h>
25#include "lisp.h" 25#include "lisp.h"
26#include "termhooks.h" 26#include "termhooks.h"
27#include "keyboard.h"
27#include "frame.h" 28#include "frame.h"
28#include "window.h" 29#include "window.h"
29#include "keyboard.h"
30#include "blockinput.h" 30#include "blockinput.h"
31#include "buffer.h" 31#include "buffer.h"
32#include "charset.h" 32#include "charset.h"
@@ -846,7 +846,7 @@ on the left of the dialog box and all following items on the right.\n\
846 /* Use the mouse's current position. */ 846 /* Use the mouse's current position. */
847 FRAME_PTR new_f = SELECTED_FRAME (); 847 FRAME_PTR new_f = SELECTED_FRAME ();
848 Lisp_Object bar_window; 848 Lisp_Object bar_window;
849 int part; 849 enum scroll_bar_part part;
850 unsigned long time; 850 unsigned long time;
851 Lisp_Object x, y; 851 Lisp_Object x, y;
852 852
@@ -2116,7 +2116,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item)
2116} 2116}
2117 2117
2118/* Construct native Windows menu(bar) based on widget_value tree. */ 2118/* Construct native Windows menu(bar) based on widget_value tree. */
2119static int 2119int
2120fill_in_menu (HMENU menu, widget_value *wv) 2120fill_in_menu (HMENU menu, widget_value *wv)
2121{ 2121{
2122 int items_added = 0; 2122 int items_added = 0;