[AC21.4] Compile fixes for GTK+

[Vin Shelton]

APPROVE COMMIT 21.4

On Wed, Mar 5, 2008 at 4:41 AM, Stephen J. Turnbull <stephen at xemacs.org> wrote:
> APPROVE COMMIT 21.5 RECOMMEND 21.4
>
> Thanks for the patch.  I've verified that the errors occur and are
> fixed by the patch, and XEmacs at least runs.  Aidan obviously
> didn't.:-(
>
> The test suite fails, but I think that's because it's not a Mule
> build.  I'll look into that later.
>
> I've committed and pushed this as two separate commits for Vin's
> convenience.
>
> Vin, the console-gtk.c patch is not appropriate for 21.4, but the
> IMAGE_INSTANCE_GTK_MASK patch is; without it GTK won't build with GCC
>>4.0.  It should apply as-is with offsets of -28 and +251 lines.
>
> Dominique Quatravaux writes:
>  > On Tue, Mar 4, 2008 at 12:44 PM, Stephen J. Turnbull <stephen at xemacs.org> wrote:
>  > > Dominique Quatravaux writes:
>  > >
>  > >   > the attached patch applies against the current Mercurial tip
>  > >
>  > >  I don't see any attachment.
>  >
>  >
>  > I've been a programmer for what, 10 years? And still falling for that
>  > one every now and then :-(...
>  >
>  >
>  > --
>  >   Dominique Quatravaux
>  >   +41 791 609 40 72
>  > diff -r dd9030354e14 -r 5f6a27b738f1 src/console-gtk.c
>  > --- a/src/console-gtk.c      Thu Feb 28 19:48:36 2008 -0800
>  > +++ b/src/console-gtk.c      Mon Mar 03 17:04:56 2008 +0100
>  > @@ -178,7 +178,7 @@ gtk_perhaps_init_unseen_key_defaults (st
>  >
>  >    if (NILP (Flookup_key (Vcurrent_global_map, key, Qnil)))
>  >      {
>  > -      Fputhash(key, Qt, Vgtk_seen_characters;)
>  > +      Fputhash(key, Qt, Vgtk_seen_characters);
>  >        Fdefine_key (Vcurrent_global_map, key, Qself_insert_command);
>  >        if (SYMBOLP(key))
>  >      {
>  > diff -r dd9030354e14 -r 5f6a27b738f1 src/glyphs-gtk.c
>  > --- a/src/glyphs-gtk.c       Thu Feb 28 19:48:36 2008 -0800
>  > +++ b/src/glyphs-gtk.c       Mon Mar 03 17:04:56 2008 +0100
>  > @@ -796,7 +796,7 @@ init_image_instance_from_gdk_image (stru
>  >      find_keyword_in_vector (instantiator, Q_file);
>  >
>  >    IMAGE_INSTANCE_GTK_PIXMAP (ii) = pixmap;
>  > -  IMAGE_INSTANCE_GTK_MASK (ii) = 0;
>  > +  IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0;
>  >    IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = gdk_image->width;
>  >    IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = gdk_image->height;
>  >    IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = gdk_image->depth;
>  > @@ -2972,7 +2972,7 @@ gtk_colorize_image_instance (Lisp_Object
>  >        IMAGE_INSTANCE_TYPE (p) = IMAGE_COLOR_PIXMAP;
>  >        /* Make sure there aren't two pointers to the same mask, causing
>  >       it to get freed twice. */
>  > -      IMAGE_INSTANCE_GTK_MASK (p) = 0;
>  > +      IMAGE_INSTANCE_PIXMAP_MASK (p) = 0;
>  >        break;
>  >
>  >      default:
>
> _______________________________________________
> XEmacs-Patches mailing list
> XEmacs-Patches at xemacs.org
> http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
>