(w32_read_socket) <WM_MENUSELECT>: Remove.

(w32_read_socket): Use EQ to compare frames.

2 files changed, 16 insertions, 13 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a81c8c00939..0ad6d64c7bb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2001-11-28  Jason Rumney  <jasonr@gnu.org>
+
+        * w32menu.c (add_menu_item): Do not use owner-draw for disabled
+        menu items.  From David Ponce <dponce@wanadoo.fr>.
+        (w32_dialog_show) [HAVE_DIALOGS]: Compile whole function
+        conditionally.
+        (w32_menu_display_help): New argument OWNER. Rewritten to store a
+        help event in the owner frame's keyboard buffer.
+
+        * w32fns.c (w32_wnd_proc) <WM_MENUSELECT>: Display help directly.
+        (Fx_show_tip): Don't subtract last width from row width.
+
+        * w32term.c (w32_read_socket) <WM_MENUSELECT>: Remove.
+        (w32_read_socket): Use EQ to compare frames.
+
 2001-11-28  Gerd Moellmann  <gerd@gnu.org>
 
         * xterm.c (x_draw_glyphs): Don't call notice_overwritten_cursor if
diff --git a/src/w32term.c b/src/w32term.c
index 71907767f27..9c0b0392424 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -176,8 +176,6 @@ extern unsigned int msh_mousewheel;
 
 extern void free_frame_menubar ();
 
-extern void w32_menu_display_help (HMENU menu, UINT menu_item, UINT flags);
-
 extern int w32_codepage_for_font (char *fontname);
 
 extern glyph_metric *w32_BDF_TextMetric(bdffont *fontp,
@@ -8728,16 +8726,6 @@ w32_read_socket (sd, bufp, numchars, expected)
             }
           break;
 
-        case WM_MENUSELECT:
-          {
-            HMENU menu = (HMENU) msg.msg.lParam;
-            UINT menu_item = (UINT) LOWORD (msg.msg.wParam);
-            UINT flags = (UINT) HIWORD (msg.msg.wParam);
-
-            w32_menu_display_help (menu, menu_item, flags);
-          }
-          break;
-
         case WM_DROPFILES:
           f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
 
@@ -9079,7 +9067,7 @@ w32_read_socket (sd, bufp, numchars, expected)
           FRAME_PTR f = XFRAME (frame);
           /* The tooltip has been drawn already.  Avoid the
              SET_FRAME_GARBAGED below.  */
-          if (f == XFRAME (tip_frame))
+          if (EQ (frame, tip_frame))
             continue;
 
           /* Check "visible" frames and mark each as obscured or not.