APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1513728276 0 # Wed Dec 20 00:04:36 2017 +0000 # Node ID 268f55c89b5c4bd6e5fe72eef1be8a2d6856a844 # Parent a5b21ebab055b2b74f16e61d09c57d88d268a74c Correct the placement of some #ifdefs, redisplay-gtk.c src/ChangeLog addition: 2017-12-20 Aidan Kehoe <kehoea(a)parhasard.net&gt; * redisplay-gtk.c (XLIKE_bevel_area): * redisplay-gtk.c (gtk_text_attributes): Correct the placement of some #ifdefs here, get the code building under GTK2 again. diff -r a5b21ebab055 -r 268f55c89b5c src/ChangeLog --- a/src/ChangeLog Mon Dec 18 22:04:46 2017 +0000 +++ b/src/ChangeLog Wed Dec 20 00:04:36 2017 +0000 ＠＠ -1,3 +1,10 ＠＠ +2017-12-20 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * redisplay-gtk.c (XLIKE_bevel_area): + * redisplay-gtk.c (gtk_text_attributes): + Correct the placement of some #ifdefs here, get the code building + under GTK2 again. + 2017-12-18 Aidan Kehoe <kehoea(a)parhasard.net&gt; * event-Xt.c: ＠＠ -8,7 +15,7 ＠＠ * event-Xt.c (x_keysym_to_character): As above. * event-xlike-inc.c: - Move the Hangule, Armenian, Georgian, Azeri, Vietnamese support in + Move the Hangul, Armenian, Georgian, Azeri, Vietnamese support from here. * redisplay-gtk.c: * redisplay-x.c: diff -r a5b21ebab055 -r 268f55c89b5c src/redisplay-gtk.c --- a/src/redisplay-gtk.c Mon Dec 18 22:04:46 2017 +0000 +++ b/src/redisplay-gtk.c Wed Dec 20 00:04:36 2017 +0000 ＠＠ -182,6 +182,7 ＠＠ #ifdef HAVE_GTK3 GtkStyleContext *gstyle = gtk_widget_get_style_context (widget); GdkWindow *window = gtk_widget_get_window (widget); +#endif #if GTK_CHECK_VERSION(3, 22, 0) cairo_region_t *region = gdk_window_get_visible_region (window); /* We should be able to avoid the next call, but the GTK documentation ＠＠ -192,7 +193,6 ＠＠ #else cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget)); #endif -#endif GtkShadowType stype; if (shadow_thickness == 0) ＠＠ -604,7 +604,7 ＠＠ bg->blue)); #endif -#if HAVE_GTK3 +#ifdef HAVE_GTK3 GdkRGBA *fg = XCOLOR_INSTANCE_GTK_COLOR (cachel->foreground); GdkRGBA *bg = XCOLOR_INSTANCE_GTK_COLOR (cachel->background); -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)