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

Diff of /emacs/src/w32menu.c

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

revision 1.55.4.1 by miles, Fri Apr 4 06:21:04 2003 UTC revision 1.55.4.2 by miles, Tue Oct 14 23:22:48 2003 UTC
# Line 1  Line 1 
1  /* Menu support for GNU Emacs on the Microsoft W32 API.  /* Menu support for GNU Emacs on the Microsoft W32 API.
2     Copyright (C) 1986, 88, 93, 94, 96, 98, 1999 Free Software Foundation, Inc.     Copyright (C) 1986,88,93,94,96,98,1999,2003  Free Software Foundation, Inc.
3    
4  This file is part of GNU Emacs.  This file is part of GNU Emacs.
5    
# Line 725  cached information about equivalent key Line 725  cached information about equivalent key
725            CHECK_LIVE_WINDOW (window);            CHECK_LIVE_WINDOW (window);
726            f = XFRAME (WINDOW_FRAME (XWINDOW (window)));            f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
727    
728            xpos = (FONT_WIDTH (FRAME_FONT (f))            xpos = WINDOW_LEFT_EDGE_X (XWINDOW (window));
729                    * XFASTINT (XWINDOW (window)->left));            ypos = WINDOW_TOP_EDGE_Y (XWINDOW (window));
           ypos = (FRAME_LINE_HEIGHT (f)  
                   * XFASTINT (XWINDOW (window)->top));  
730          }          }
731        else        else
732          /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,          /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
# Line 1037  menubar_selection_callback (FRAME_PTR f, Line 1035  menubar_selection_callback (FRAME_PTR f,
1035                int j;                int j;
1036                struct input_event buf;                struct input_event buf;
1037                Lisp_Object frame;                Lisp_Object frame;
1038                  EVENT_INIT (buf);
1039    
1040                XSETFRAME (frame, f);                XSETFRAME (frame, f);
1041                buf.kind = MENU_BAR_EVENT;                buf.kind = MENU_BAR_EVENT;
# Line 1601  set_frame_menubar (f, first_time, deep_p Line 1600  set_frame_menubar (f, first_time, deep_p
1600      /* Force the window size to be recomputed so that the frame's text      /* Force the window size to be recomputed so that the frame's text
1601         area remains the same, if menubar has just been created.  */         area remains the same, if menubar has just been created.  */
1602      if (old_widget == NULL)      if (old_widget == NULL)
1603        x_set_window_size (f, 0, FRAME_WIDTH (f), FRAME_HEIGHT (f));        x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f));
1604    }    }
1605    
1606    UNBLOCK_INPUT;    UNBLOCK_INPUT;
# Line 2417  void globals_of_w32menu () Line 2416  void globals_of_w32menu ()
2416    get_menu_item_info = (GetMenuItemInfoA_Proc) GetProcAddress (user32, "GetMenuItemInfoA");    get_menu_item_info = (GetMenuItemInfoA_Proc) GetProcAddress (user32, "GetMenuItemInfoA");
2417    set_menu_item_info = (SetMenuItemInfoA_Proc) GetProcAddress (user32, "SetMenuItemInfoA");    set_menu_item_info = (SetMenuItemInfoA_Proc) GetProcAddress (user32, "SetMenuItemInfoA");
2418  }  }
2419    
2420    /* arch-tag: 0eaed431-bb4e-4aac-a527-95a1b4f1fed0
2421       (do not change this comment) */

Legend:
Removed from v.1.55.4.1  
changed lines
  Added in v.1.55.4.2

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