(add_menu_item): Make help_echo and radio buttons

work for most menu items.  From David Ponce
<david.ponce@wanadoo.fr>.

diff --git a/src/w32menu.c b/src/w32menu.c
index f6c9664edfe245cabbda14e6720850e71f62449e..3fe87ba3dd9c95a3489d38b614f11b2798b4afcc 100644 (file)
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -2089,7 +2089,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item)
        }
       /* Draw radio buttons and tickboxes. */
       else if (wv->selected && (wv->button_type == BUTTON_TYPE_TOGGLE ||
-                           wv->button_type == BUTTON_TYPE_RADIO))
+                               wv->button_type == BUTTON_TYPE_RADIO))
        fuFlags |= MF_CHECKED;
       else
        fuFlags |= MF_UNCHECKED;
@@ -2105,7 +2105,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item)
                 out_string );
 
   /* This must be done after the menu item is created.  */
-  if ((fuFlags & MF_STRING) != 0)
+  if (!wv->title && wv->call_data != 0)
     {
       HMODULE user32 = GetModuleHandle ("user32.dll");
       FARPROC set_menu_item_info = GetProcAddress (user32, "SetMenuItemInfoA");