comparison src/w32term.c @ 44108:9b9674209839

(w32_handle_tool_bar_click): Detect up and down events correctly. Do not pass up_modifier to keyboard buffer.

44107:c10785cb0f83

  /* If item is disabled, do nothing.  */
  enabled_p = AREF (f->tool_bar_items, prop_idx + TOOL_BAR_ITEM_ENABLED_P);
  if (NILP (enabled_p))
    return;
  
  if (button_event->kind == mouse_click)
    {
      /* Show item in pressed state.  */
      show_mouse_face (dpyinfo, DRAW_IMAGE_SUNKEN);
      dpyinfo->mouse_face_image_state = DRAW_IMAGE_SUNKEN;
      last_tool_bar_item = prop_idx;

      kbd_buffer_store_event (&event);

      event.kind = TOOL_BAR_EVENT;
      event.frame_or_window = frame;
      event.arg = key;
      event.modifiers = button_event->modifiers;
      kbd_buffer_store_event (&event);
      last_tool_bar_item = -1;
    }
}

44108:9b9674209839

  /* If item is disabled, do nothing.  */
  enabled_p = AREF (f->tool_bar_items, prop_idx + TOOL_BAR_ITEM_ENABLED_P);
  if (NILP (enabled_p))
    return;
  
  if (button_event->modifiers & down_modifier)
    {
      /* Show item in pressed state.  */
      show_mouse_face (dpyinfo, DRAW_IMAGE_SUNKEN);
      dpyinfo->mouse_face_image_state = DRAW_IMAGE_SUNKEN;
      last_tool_bar_item = prop_idx;

      kbd_buffer_store_event (&event);

      event.kind = TOOL_BAR_EVENT;
      event.frame_or_window = frame;
      event.arg = key;
      /* The keyboard buffer doesn't like the up modifier being set.  */
      event.modifiers = button_event->modifiers & ~up_modifier;
      kbd_buffer_store_event (&event);
      last_tool_bar_item = -1;
    }
}