diff options
| author | Po Lu | 2022-04-19 11:18:25 +0800 |
|---|---|---|
| committer | Po Lu | 2022-04-19 11:18:25 +0800 |
| commit | 92667cc2fb17af947c202d2de765d8736679e858 (patch) | |
| tree | 7afe0dc86311b8f2b4a398a419ea6a7597b6d88e /src | |
| parent | 4dd47196f67a223abf482caf430c3e5dd5c05977 (diff) | |
| download | emacs-92667cc2fb17af947c202d2de765d8736679e858.tar.gz emacs-92667cc2fb17af947c202d2de765d8736679e858.zip | |
Fix last change for GTK 2
* src/xfns.c (x_set_alpha_background):
* src/xterm.c (x_update_opaque_region): Move some ifdefs around.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 2 | ||||
| -rw-r--r-- | src/xterm.c | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c index 9ceba98f67d..c7e2984ce13 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -732,7 +732,7 @@ x_set_alpha_background (struct frame *f, Lisp_Object arg, Lisp_Object oldval) | |||
| 732 | { | 732 | { |
| 733 | unsigned long opaque_region[] = {0, 0, FRAME_PIXEL_WIDTH (f), | 733 | unsigned long opaque_region[] = {0, 0, FRAME_PIXEL_WIDTH (f), |
| 734 | FRAME_PIXEL_HEIGHT (f)}; | 734 | FRAME_PIXEL_HEIGHT (f)}; |
| 735 | #ifdef USE_GTK | 735 | #ifdef HAVE_GTK3 |
| 736 | GObjectClass *object_class; | 736 | GObjectClass *object_class; |
| 737 | GtkWidgetClass *class; | 737 | GtkWidgetClass *class; |
| 738 | #endif | 738 | #endif |
diff --git a/src/xterm.c b/src/xterm.c index b5b2fe32947..c4652c19c66 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -3790,6 +3790,10 @@ x_update_opaque_region (struct frame *f, XEvent *configure) | |||
| 3790 | (configure | 3790 | (configure |
| 3791 | ? configure->xconfigure.height | 3791 | ? configure->xconfigure.height |
| 3792 | : FRAME_PIXEL_HEIGHT (f))}; | 3792 | : FRAME_PIXEL_HEIGHT (f))}; |
| 3793 | #ifdef HAVE_GTK3 | ||
| 3794 | GObjectClass *object_class; | ||
| 3795 | GtkWidgetClass *class; | ||
| 3796 | #endif | ||
| 3793 | 3797 | ||
| 3794 | if (!FRAME_DISPLAY_INFO (f)->alpha_bits) | 3798 | if (!FRAME_DISPLAY_INFO (f)->alpha_bits) |
| 3795 | return; | 3799 | return; |
| @@ -3815,6 +3819,14 @@ x_update_opaque_region (struct frame *f, XEvent *configure) | |||
| 3815 | FRAME_DISPLAY_INFO (f)->Xatom_net_wm_opaque_region, | 3819 | FRAME_DISPLAY_INFO (f)->Xatom_net_wm_opaque_region, |
| 3816 | XA_CARDINAL, 32, PropModeReplace, | 3820 | XA_CARDINAL, 32, PropModeReplace, |
| 3817 | (unsigned char *) &opaque_region, 4); | 3821 | (unsigned char *) &opaque_region, 4); |
| 3822 | else | ||
| 3823 | { | ||
| 3824 | object_class = G_OBJECT_GET_CLASS (FRAME_GTK_OUTER_WIDGET (f)); | ||
| 3825 | class = GTK_WIDGET_CLASS (object_class); | ||
| 3826 | |||
| 3827 | if (class->style_updated) | ||
| 3828 | class->style_updated (FRAME_GTK_OUTER_WIDGET (f)); | ||
| 3829 | } | ||
| 3818 | #endif | 3830 | #endif |
| 3819 | unblock_input (); | 3831 | unblock_input (); |
| 3820 | } | 3832 | } |