diff options
| author | Robert Pluim | 2018-10-11 16:02:51 +0200 |
|---|---|---|
| committer | Robert Pluim | 2018-10-13 10:44:37 +0200 |
| commit | 80e0bfa96da69e5d1484c5031f42b1b1742567db (patch) | |
| tree | 589a3f16edf5f73983800d0dd4365cd42e57ea37 /src | |
| parent | 91c4c46fd5538c1c8dbe00f272e2a65175940de8 (diff) | |
| download | emacs-80e0bfa96da69e5d1484c5031f42b1b1742567db.tar.gz emacs-80e0bfa96da69e5d1484c5031f42b1b1742567db.zip | |
Call GTK functions only on GTK scrollbars
* src/gtkutil.c (xg_set_background_color) [USE_TOOLKIT_SCROLL_BARS]:
Don't call GTK functions on non-GTK scrollbars (Bug#32975).
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtkutil.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index 6b72671da91..5879ab683ea 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -1498,6 +1498,7 @@ xg_set_background_color (struct frame *f, unsigned long bg) | |||
| 1498 | block_input (); | 1498 | block_input (); |
| 1499 | xg_set_widget_bg (f, FRAME_GTK_WIDGET (f), FRAME_BACKGROUND_PIXEL (f)); | 1499 | xg_set_widget_bg (f, FRAME_GTK_WIDGET (f), FRAME_BACKGROUND_PIXEL (f)); |
| 1500 | 1500 | ||
| 1501 | #ifdef USE_TOOLKIT_SCROLL_BARS | ||
| 1501 | Lisp_Object bar; | 1502 | Lisp_Object bar; |
| 1502 | for (bar = FRAME_SCROLL_BARS (f); | 1503 | for (bar = FRAME_SCROLL_BARS (f); |
| 1503 | !NILP (bar); | 1504 | !NILP (bar); |
| @@ -1508,7 +1509,7 @@ xg_set_background_color (struct frame *f, unsigned long bg) | |||
| 1508 | GtkWidget *webox = gtk_widget_get_parent (scrollbar); | 1509 | GtkWidget *webox = gtk_widget_get_parent (scrollbar); |
| 1509 | xg_set_widget_bg (f, webox, FRAME_BACKGROUND_PIXEL (f)); | 1510 | xg_set_widget_bg (f, webox, FRAME_BACKGROUND_PIXEL (f)); |
| 1510 | } | 1511 | } |
| 1511 | 1512 | #endif | |
| 1512 | unblock_input (); | 1513 | unblock_input (); |
| 1513 | } | 1514 | } |
| 1514 | } | 1515 | } |