/[emacs]/emacs/src/xmenu.c
ViewVC logotype

Diff of /emacs/src/xmenu.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.273 by jhd, Tue Dec 7 13:11:59 2004 UTC revision 1.274 by jhd, Mon Dec 27 15:24:12 2004 UTC
# Line 1243  popup_get_selection (initial_event, dpyi Line 1243  popup_get_selection (initial_event, dpyi
1243                 && dpyinfo->display == event.xbutton.display)                 && dpyinfo->display == event.xbutton.display)
1244          {          {
1245            KeySym keysym = XLookupKeysym (&event.xkey, 0);            KeySym keysym = XLookupKeysym (&event.xkey, 0);
1246    
1247              /* Pop down on C-g.  */
1248              if (keysym == XK_g && (event.xkey.state & ControlMask) != 0)
1249                popup_activated_flag = 0;
1250    
1251            if (!IsModifierKey (keysym)            if (!IsModifierKey (keysym)
1252                && x_any_window_to_frame (dpyinfo, event.xany.window) != NULL)                && x_any_window_to_frame (dpyinfo, event.xany.window) != NULL)
1253              popup_activated_flag = 0;              popup_activated_flag = 0;
# Line 2226  set_frame_menubar (f, first_time, deep_p Line 2231  set_frame_menubar (f, first_time, deep_p
2231      }      }
2232    else    else
2233      {      {
2234          char menuOverride[] = "Ctrl<KeyPress>g: MenuGadgetEscape()";
2235          XtTranslations  override = XtParseTranslationTable (menuOverride);
2236    
2237        menubar_widget = lw_create_widget ("menubar", "menubar", id, first_wv,        menubar_widget = lw_create_widget ("menubar", "menubar", id, first_wv,
2238                                           f->output_data.x->column_widget,                                           f->output_data.x->column_widget,
2239                                           0,                                           0,
# Line 2234  set_frame_menubar (f, first_time, deep_p Line 2242  set_frame_menubar (f, first_time, deep_p
2242                                           popup_deactivate_callback,                                           popup_deactivate_callback,
2243                                           menu_highlight_callback);                                           menu_highlight_callback);
2244        f->output_data.x->menubar_widget = menubar_widget;        f->output_data.x->menubar_widget = menubar_widget;
2245    
2246          /* Make menu pop down on C-g.  */
2247          XtOverrideTranslations (menubar_widget, override);
2248      }      }
2249    
2250    {    {
# Line 3155  xdialog_show (f, keymaps, title, error) Line 3166  xdialog_show (f, keymaps, title, error)
3166              }              }
3167          }          }
3168      }      }
3169      else
3170        /* Make "Cancel" equivalent to C-g.  */
3171        Fsignal (Qquit, Qnil);
3172    
3173    return Qnil;    return Qnil;
3174  }  }
# Line 3500  xmenu_show (f, x, y, for_click, keymaps, Line 3514  xmenu_show (f, x, y, for_click, keymaps,
3514      case XM_FAILURE:      case XM_FAILURE:
3515        *error = "Can't activate menu";        *error = "Can't activate menu";
3516      case XM_IA_SELECT:      case XM_IA_SELECT:
3517          entry = Qnil;
3518          break;
3519      case XM_NO_SELECT:      case XM_NO_SELECT:
3520          /* Make "Cancel" equivalent to C-g unless this menu was popped up by
3521             a mouse press.  */
3522          if (! for_click)
3523            Fsignal (Qquit, Qnil);
3524        entry = Qnil;        entry = Qnil;
3525        break;        break;
3526      }      }

Legend:
Removed from v.1.273  
changed lines
  Added in v.1.274

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26