Skip to content

Commit c32d35e

Browse files
committed
* src/gtkutil.c, src/nsterm.m: Fix bug#39808
Complete 3b4bd4b where I apparently failed to grep properly and missed two more places where the dummy events were generated. * src/nsterm.m ([EmacsView toolbarClicked:]): * src/gtkutil.c (xg_tool_bar_callback): Don't emit dummy "prefix" events.
1 parent 125da00 commit c32d35e

File tree

2 files changed

+0
-13
lines changed

2 files changed

+0
-13
lines changed

src/gtkutil.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4398,13 +4398,6 @@ xg_tool_bar_callback (GtkWidget *w, gpointer client_data)
43984398
key = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_KEY);
43994399
XSETFRAME (frame, f);
44004400

4401-
/* We generate two events here. The first one is to set the prefix
4402-
to `(tool_bar)', see keyboard.c. */
4403-
event.kind = TOOL_BAR_EVENT;
4404-
event.frame_or_window = frame;
4405-
event.arg = frame;
4406-
kbd_buffer_store_event (&event);
4407-
44084401
event.kind = TOOL_BAR_EVENT;
44094402
event.frame_or_window = frame;
44104403
event.arg = key;

src/nsterm.m

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8185,12 +8185,6 @@ - (instancetype)toolbarClicked: (id)item
81858185
if (!emacs_event)
81868186
return self;
81878187

8188-
/* Send first event (for some reason two needed). */
8189-
theEvent = [[self window] currentEvent];
8190-
emacs_event->kind = TOOL_BAR_EVENT;
8191-
XSETFRAME (emacs_event->arg, emacsframe);
8192-
EV_TRAILER (theEvent);
8193-
81948188
emacs_event->kind = TOOL_BAR_EVENT;
81958189
/* XSETINT (emacs_event->code, 0); */
81968190
emacs_event->arg = AREF (emacsframe->tool_bar_items,

0 commit comments

Comments
 (0)