(AppendMenuW_Proc): Move declaration to w32term.h.

diff --git a/src/ChangeLog b/src/ChangeLog
index f89f253f5f3a37281088c6a57c59e59dbbe1d8ea..08783ab0f8e5c989d20c99cd5dd77b773d3b606c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-07  Jason Rumney  <jasonr@gnu.org>
+
+       * w32term.h (AppendMenuW_Proc): Move declaration from w32menu.c.
+
+       * w32fns.c (w32_wnd_proc) [WM_MEASUREITEM, WM_DRAWITEM]: Handle
+       Unicode menu titles.
+
 2004-09-07  Kim F. Storm  <storm@cua.dk>
 
        * xdisp.c (set_cursor_from_row): Fix last change.  Only use 'cursor'

diff --git a/src/w32menu.c b/src/w32menu.c
index f3f3eb785b06e4d0ce5a0901b6cbba7175de4ca9..4553895d829069312a044229e5bf2b5bdd07bbeb 100644 (file)
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -143,11 +143,6 @@ typedef BOOL (WINAPI * SetMenuItemInfoA_Proc) (
     IN UINT,
     IN BOOL,
     IN LPCMENUITEMINFOA);
-typedef BOOL (WINAPI * AppendMenuW_Proc) (
-    IN HMENU,
-    IN UINT,
-    IN UINT_PTR,
-    IN LPCWSTR);
 
 GetMenuItemInfoA_Proc get_menu_item_info = NULL;
 SetMenuItemInfoA_Proc set_menu_item_info = NULL;