diff options
| author | Jan Djärv | 2008-05-13 08:13:24 +0000 |
|---|---|---|
| committer | Jan Djärv | 2008-05-13 08:13:24 +0000 |
| commit | bb16531656a1daf7deec8a14e3a8a5fdb2c87818 (patch) | |
| tree | a06cfeaf1b66495bc6a08012ee9ce60abfd7e822 | |
| parent | 1937f3dc3d3d085a4cb9ad2f1c14e4ca1fbfa788 (diff) | |
| download | emacs-bb16531656a1daf7deec8a14e3a8a5fdb2c87818.tar.gz emacs-bb16531656a1daf7deec8a14e3a8a5fdb2c87818.zip | |
(handle_one_xevent): Don't pass buttons higher than 3
to Gtk+ menus.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xterm.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index dc4198045b8..46ba627e2e7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-05-13 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * xterm.c (handle_one_xevent): Don't pass buttons higher than 3 | ||
| 4 | to Gtk+ menus. | ||
| 5 | |||
| 1 | 2008-05-12 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 6 | 2008-05-12 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 2 | 7 | ||
| 3 | * emacs.c (main_thread): Conditionalize on | 8 | * emacs.c (main_thread): Conditionalize on |
diff --git a/src/xterm.c b/src/xterm.c index 3b625b0d662..89cf06c05e0 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -6848,6 +6848,8 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit) | |||
| 6848 | if ( | 6848 | if ( |
| 6849 | #ifdef USE_GTK | 6849 | #ifdef USE_GTK |
| 6850 | ! popup_activated () | 6850 | ! popup_activated () |
| 6851 | /* Gtk+ menus only react to the first three buttons. */ | ||
| 6852 | && event.xbutton.button < 3 | ||
| 6851 | && | 6853 | && |
| 6852 | #endif | 6854 | #endif |
| 6853 | f && event.type == ButtonPress | 6855 | f && event.type == ButtonPress |