diff options
| author | Jan Djärv | 2007-08-04 09:48:42 +0000 |
|---|---|---|
| committer | Jan Djärv | 2007-08-04 09:48:42 +0000 |
| commit | 991bde0d8c15ed6064ed4064283a2b1e886401d8 (patch) | |
| tree | c853eb69cb9bf9027f72513f8da980f4c1599a54 /src | |
| parent | a45d998e7b89bb8adfa25043683610500a13f8fe (diff) | |
| download | emacs-991bde0d8c15ed6064ed4064283a2b1e886401d8.tar.gz emacs-991bde0d8c15ed6064ed4064283a2b1e886401d8.zip | |
(xg_tool_bar_callback): Generate two TOOL_BAR_EVENT:s,
add comment explaining why.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/gtkutil.c | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 87376db4e7f..7fbc9d11ea7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-08-04 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * gtkutil.c (xg_tool_bar_callback): Generate two TOOL_BAR_EVENT:s, | ||
| 4 | add comment explaining why. | ||
| 5 | |||
| 1 | 2007-08-03 Richard Stallman <rms@gnu.org> | 6 | 2007-08-03 Richard Stallman <rms@gnu.org> |
| 2 | 7 | ||
| 3 | * fileio.c (Fvisited_file_modtime): Use make_time. | 8 | * fileio.c (Fvisited_file_modtime): Use make_time. |
diff --git a/src/gtkutil.c b/src/gtkutil.c index f52e68b1230..29aafc013e9 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -3372,8 +3372,16 @@ xg_tool_bar_callback (w, client_data) | |||
| 3372 | 3372 | ||
| 3373 | key = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_KEY); | 3373 | key = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_KEY); |
| 3374 | XSETFRAME (frame, f); | 3374 | XSETFRAME (frame, f); |
| 3375 | |||
| 3376 | /* We generate two events here. The first one is to set the prefix | ||
| 3377 | to `(tool_bar)', see keyboard.c. */ | ||
| 3375 | event.kind = TOOL_BAR_EVENT; | 3378 | event.kind = TOOL_BAR_EVENT; |
| 3376 | event.frame_or_window = frame; | 3379 | event.frame_or_window = frame; |
| 3380 | event.arg = frame; | ||
| 3381 | kbd_buffer_store_event (&event); | ||
| 3382 | |||
| 3383 | event.kind = TOOL_BAR_EVENT; | ||
| 3384 | event.frame_or_window = frame; | ||
| 3377 | event.arg = key; | 3385 | event.arg = key; |
| 3378 | /* Convert between the modifier bits GDK uses and the modifier bits | 3386 | /* Convert between the modifier bits GDK uses and the modifier bits |
| 3379 | Emacs uses. This assumes GDK an X masks are the same, which they are when | 3387 | Emacs uses. This assumes GDK an X masks are the same, which they are when |