diff options
| author | Jason Rumney <jasonr@gnu.org> | 2000-10-19 19:25:53 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2000-10-19 19:25:53 +0000 |
| commit | 0b6bb670882121224aec4a76555b2c526fdf8d03 (patch) | |
| tree | a3ddcfe74fc1116d48db339eab095e07ec2acb84 /src/w32menu.c | |
| parent | 2d0c0bd755321d6d1815fd6f619a100cdebf5d2e (diff) | |
| download | emacs-0b6bb670882121224aec4a76555b2c526fdf8d03.tar.gz | |
(add_menu_item): Do not use MF_OWNERDRAW for titles, as it has stopped working.
(Fx_popup_menu, Fx_popup_dialog): Check for tool-bar position like menu-bar.
Diffstat (limited to 'src/w32menu.c')
| -rw-r--r-- | src/w32menu.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/w32menu.c b/src/w32menu.c index 257722550ab..b62f7af2776 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -642,7 +642,8 @@ cached information about equivalent key sequences.") /* Decode the first argument: find the window and the coordinates. */ if (EQ (position, Qt) - || (CONSP (position) && EQ (XCAR (position), Qmenu_bar))) + || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar) + || EQ (XCAR (position), Qtool_bar)))) { /* Use the mouse's current position. */ FRAME_PTR new_f = SELECTED_FRAME (); @@ -840,7 +841,8 @@ on the left of the dialog box and all following items on the right.\n\ /* Decode the first argument: find the window or frame to use. */ if (EQ (position, Qt) - || (CONSP (position) && EQ (XCAR (position), Qmenu_bar))) + || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar) + || EQ (XCAR (position), Qtool_bar)))) { #if 0 /* Using the frame the mouse is on may not be right. */ /* Use the mouse's current position. */ @@ -1569,7 +1571,6 @@ w32_menu_show (f, x, y, for_click, keymaps, title, error) = (Lisp_Object *) alloca (menu_items_used * sizeof (Lisp_Object)); int submenu_depth = 0; int first_pane; - int next_release_must_exit = 0; *error = NULL; @@ -2064,7 +2065,8 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item) out_string = LocalAlloc (0, strlen (wv->name) + 1); strcpy (out_string, wv->name); #endif - fuFlags = MF_OWNERDRAW | MF_DISABLED; + /* NTEMACS_TODO: Why has owner drawing stopped working? */ + fuFlags = /*MF_OWNERDRAW |*/ MF_DISABLED; } /* Draw radio buttons and tickboxes. */ @@ -2096,7 +2098,8 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item) bzero (&info, sizeof (info)); info.cbSize = sizeof (info); info.fMask = MIIM_DATA; - /* Set help string for menu item. */ + + /* Set help string for menu item. */ info.dwItemData = (DWORD)wv->help; if (wv->button_type == BUTTON_TYPE_RADIO) |