# HG changeset patch
# User Andrew Innes <andrewi@gnu.org>
# Date 966987425 0
# Node ID cd392fdf0e9f49e9656eed3ec12ba838ee1cca1e
# Parent  1743924e00dd85225a4e98b80c00b297c1ee0758
Include keyboard.h before frame.h.  Fix compile
warnings.

diff -r 1743924e00dd -r cd392fdf0e9f src/w32menu.c
--- a/src/w32menu.c	Tue Aug 22 23:33:55 2000 +0000
+++ b/src/w32menu.c	Tue Aug 22 23:37:05 2000 +0000
@@ -24,9 +24,9 @@
 #include <stdio.h>
 #include "lisp.h"
 #include "termhooks.h"
+#include "keyboard.h"
 #include "frame.h"
 #include "window.h"
-#include "keyboard.h"
 #include "blockinput.h"
 #include "buffer.h"
 #include "charset.h"
@@ -846,7 +846,7 @@
       /* Use the mouse's current position.  */
       FRAME_PTR new_f = SELECTED_FRAME ();
       Lisp_Object bar_window;
-      int part;
+      enum scroll_bar_part part;
       unsigned long time;
       Lisp_Object x, y;
 
@@ -2116,7 +2116,7 @@
 }
 
 /* Construct native Windows menu(bar) based on widget_value tree.  */
-static int
+int
 fill_in_menu (HMENU menu, widget_value *wv)
 {
   int items_added = 0;