[Emacs-diffs] Changes to emacs/lwlib/xlwmenu.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/lwlib/xlwmenu.c
diff -c emacs/lwlib/xlwmenu.c:1.57.4.1 emacs/lwlib/xlwmenu.c:1.57.4.2
*** emacs/lwlib/xlwmenu.c:1.57.4.1      Fri Apr 16 12:50:38 2004
--- emacs/lwlib/xlwmenu.c       Thu Nov  4 08:55:40 2004
***************
*** 2054,2079 ****
  }
  
  static widget_value *
! find_first_selectable (mw, item, skip_no_call_data)
       XlwMenuWidget mw;
       widget_value *item;
!      int skip_no_call_data;
  {
    widget_value *current = item;
    enum menu_separator separator;
  
    while (lw_separator_p (current->name, &separator, 0) || !current->enabled
!          || (skip_no_call_data && !current->call_data))
      if (current->next)
        current=current->next;
      else
!       return NULL;
  
    return current;
  }
  
  static widget_value *
! find_next_selectable (mw, item, skip_no_call_data)
       XlwMenuWidget mw;
       widget_value *item;
  {
--- 2054,2079 ----
  }
  
  static widget_value *
! find_first_selectable (mw, item, skip_titles)
       XlwMenuWidget mw;
       widget_value *item;
!      int skip_titles;
  {
    widget_value *current = item;
    enum menu_separator separator;
  
    while (lw_separator_p (current->name, &separator, 0) || !current->enabled
!          || (skip_titles && !current->call_data && !current->contents))
      if (current->next)
        current=current->next;
      else
!       return NULL;
  
    return current;
  }
  
  static widget_value *
! find_next_selectable (mw, item, skip_titles)
       XlwMenuWidget mw;
       widget_value *item;
  {
***************
*** 2082,2088 ****
  
    while (current->next && (current=current->next) &&
         (lw_separator_p (current->name, &separator, 0) || !current->enabled
!           || (skip_no_call_data && !current->call_data)))
      ;
  
    if (current == item)
--- 2082,2088 ----
  
    while (current->next && (current=current->next) &&
         (lw_separator_p (current->name, &separator, 0) || !current->enabled
!           || (skip_titles && !current->call_data && !current->contents)))
      ;
  
    if (current == item)
***************
*** 2093,2099 ****
  
        while (lw_separator_p (current->name, &separator, 0)
               || !current->enabled
!              || (skip_no_call_data && !current->call_data))
        {
          if (current->next)
            current=current->next;
--- 2093,2100 ----
  
        while (lw_separator_p (current->name, &separator, 0)
               || !current->enabled
!              || (skip_titles && !current->call_data
!                  && !current->contents))
        {
          if (current->next)
            current=current->next;
***************
*** 2108,2121 ****
  }
  
  static widget_value *
! find_prev_selectable (mw, item, skip_no_call_data)
       XlwMenuWidget mw;
       widget_value *item;
  {
    widget_value *current = item;
    widget_value *prev = item;
  
!   while ((current=find_next_selectable (mw, current, skip_no_call_data))
           != item)
      {
        if (prev == current)
--- 2109,2122 ----
  }
  
  static widget_value *
! find_prev_selectable (mw, item, skip_titles)
       XlwMenuWidget mw;
       widget_value *item;
  {
    widget_value *current = item;
    widget_value *prev = item;
  
!   while ((current=find_next_selectable (mw, current, skip_titles))
           != item)
      {
        if (prev == current)
***************
*** 2141,2148 ****
    if (mw->menu.old_depth == mw->menu.top_depth)
      /* When <down> in the menu-bar is pressed, display the corresponding
         sub-menu and select the first selectable menu item there.
!        If this is a popup menu, skip items with zero call data (title of
!        the popup).  */
      set_new_state (mw,
                     find_first_selectable (mw,
                                            selected_item->contents,
--- 2142,2148 ----
    if (mw->menu.old_depth == mw->menu.top_depth)
      /* When <down> in the menu-bar is pressed, display the corresponding
         sub-menu and select the first selectable menu item there.
!        If this is a popup menu, skip title item of the popup.  */
      set_new_state (mw,
                     find_first_selectable (mw,
                                            selected_item->contents,
***************
*** 2174,2181 ****
         last selectable item in the list.  So we select the first
         selectable one and find the previous selectable item.  Is there
         a better way?  */
!       /* If this is a popup menu, skip items with zero call data (title of
!          the popup).  */
        set_new_state (mw,
                       find_first_selectable (mw,
                                              selected_item->contents,
--- 2174,2180 ----
         last selectable item in the list.  So we select the first
         selectable one and find the previous selectable item.  Is there
         a better way?  */
!       /* If this is a popup menu, skip title item of the popup.  */
        set_new_state (mw,
                       find_first_selectable (mw,
                                              selected_item->contents,