/[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.266 by jhd, Fri Nov 12 10:34:36 2004 UTC revision 1.267 by kfstorm, Fri Nov 12 13:46:39 2004 UTC
# Line 524  single_menu_item (key, item, dummy, skp_ Line 524  single_menu_item (key, item, dummy, skp_
524      return;                     /* Not a menu item.  */      return;                     /* Not a menu item.  */
525    
526    map = XVECTOR (item_properties)->contents[ITEM_PROPERTY_MAP];    map = XVECTOR (item_properties)->contents[ITEM_PROPERTY_MAP];
527      
528    if (skp->notreal)    if (skp->notreal)
529      {      {
530        /* We don't want to make a menu, just traverse the keymaps to        /* We don't want to make a menu, just traverse the keymaps to
# Line 1098  on the left of the dialog box and all fo Line 1098  on the left of the dialog box and all fo
1098           the dialog.  Also, the lesstif/motif version crashes if there are           the dialog.  Also, the lesstif/motif version crashes if there are
1099           no buttons.  */           no buttons.  */
1100        contents = Fcons (title, Fcons (Fcons (build_string ("Ok"), Qt), Qnil));        contents = Fcons (title, Fcons (Fcons (build_string ("Ok"), Qt), Qnil));
1101        
1102      list_of_panes (Fcons (contents, Qnil));      list_of_panes (Fcons (contents, Qnil));
1103    
1104      /* Display them in a dialog box.  */      /* Display them in a dialog box.  */
# Line 1178  pop_down_menu (dummy) Line 1178  pop_down_menu (dummy)
1178       int dummy;       int dummy;
1179  {  {
1180    popup_activated_flag = 0;    popup_activated_flag = 0;
1181      return Qnil;
1182  }  }
1183    
1184  /* Loop in Xt until the menu pulldown or dialog popup has been  /* Loop in Xt until the menu pulldown or dialog popup has been
# Line 1272  pop_down_menu (dummy) Line 1273  pop_down_menu (dummy)
1273        current_menu = 0;        current_menu = 0;
1274        popup_activated_flag = 0;        popup_activated_flag = 0;
1275      }      }
1276      return Qnil;
1277  }  }
1278    
1279  static void  static void
# Line 2417  menu_position_func (menu, x, y, push_in, Line 2419  menu_position_func (menu, x, y, push_in,
2419    GtkRequisition req;    GtkRequisition req;
2420    int disp_width = FRAME_X_DISPLAY_INFO (data->f)->width;    int disp_width = FRAME_X_DISPLAY_INFO (data->f)->width;
2421    int disp_height = FRAME_X_DISPLAY_INFO (data->f)->height;    int disp_height = FRAME_X_DISPLAY_INFO (data->f)->height;
2422      
2423    *x = data->x;    *x = data->x;
2424    *y = data->y;    *y = data->y;
2425    

Legend:
Removed from v.1.266  
changed lines
  Added in v.1.267

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