[Emacs-diffs] Changes to emacs/oldXMenu/Destroy.c

[Juanma Barranquero]

Index: emacs/oldXMenu/Destroy.c
diff -c emacs/oldXMenu/Destroy.c:1.1 emacs/oldXMenu/Destroy.c:1.2
*** emacs/oldXMenu/Destroy.c:1.1        Sun Oct  3 15:34:59 1999
--- emacs/oldXMenu/Destroy.c    Tue Feb  4 09:19:01 2003
***************
*** 1,6 ****
  #include "copyright.h"
  
! /* $Header: /cvsroot/emacs/emacs/oldXMenu/Destroy.c,v 1.1 1999/10/03 19:34:59 
fx Exp $ */
  /* Copyright    Massachusetts Institute of Technology    1985 */
  
  /*
--- 1,6 ----
  #include "copyright.h"
  
! /* $Header: /cvsroot/emacs/emacs/oldXMenu/Destroy.c,v 1.2 2003/02/04 14:19:01 
lektu Exp $ */
  /* Copyright    Massachusetts Institute of Technology    1985 */
  
  /*
***************
*** 80,112 ****
       */
      if ((menu->p_bdr_color != BlackPixel(display, DefaultScreen(display))) && 
(menu->p_bdr_color != WhitePixel(display, DefaultScreen(display))))
        XFreeColors(
!                   display, 
                    DefaultColormap(display, DefaultScreen(display)),
!                   &menu->p_bdr_color, 
                    1, 0);
      if ((menu->s_bdr_color != BlackPixel(display, DefaultScreen(display))) && 
(menu->s_bdr_color != WhitePixel(display, DefaultScreen(display))))
        XFreeColors(
!                   display, 
!                   DefaultColormap(display, DefaultScreen(display)), 
!                   &menu->s_bdr_color, 
                    1, 0);
      if ((menu->p_frg_color != BlackPixel(display, DefaultScreen(display))) && 
(menu->p_frg_color != WhitePixel(display, DefaultScreen(display))))
        XFreeColors(
!                   display, 
                    DefaultColormap(display, DefaultScreen(display)),
!                   &menu->p_frg_color, 
                    1, 0);
      if ((menu->s_frg_color != BlackPixel(display, DefaultScreen(display))) && 
(menu->s_frg_color != WhitePixel(display, DefaultScreen(display))))
        XFreeColors(
!                   display, 
                    DefaultColormap(display, DefaultScreen(display)),
!                   &menu->s_frg_color, 
                    1, 0);
      if ((menu->bkgnd_color != BlackPixel(display, DefaultScreen(display))) && 
(menu->bkgnd_color != WhitePixel(display, DefaultScreen(display))))
        XFreeColors(
!                   display, 
                    DefaultColormap(display, DefaultScreen(display)),
!                   &menu->bkgnd_color, 
                    1, 0);
  
      /*
--- 80,112 ----
       */
      if ((menu->p_bdr_color != BlackPixel(display, DefaultScreen(display))) && 
(menu->p_bdr_color != WhitePixel(display, DefaultScreen(display))))
        XFreeColors(
!                   display,
                    DefaultColormap(display, DefaultScreen(display)),
!                   &menu->p_bdr_color,
                    1, 0);
      if ((menu->s_bdr_color != BlackPixel(display, DefaultScreen(display))) && 
(menu->s_bdr_color != WhitePixel(display, DefaultScreen(display))))
        XFreeColors(
!                   display,
!                   DefaultColormap(display, DefaultScreen(display)),
!                   &menu->s_bdr_color,
                    1, 0);
      if ((menu->p_frg_color != BlackPixel(display, DefaultScreen(display))) && 
(menu->p_frg_color != WhitePixel(display, DefaultScreen(display))))
        XFreeColors(
!                   display,
                    DefaultColormap(display, DefaultScreen(display)),
!                   &menu->p_frg_color,
                    1, 0);
      if ((menu->s_frg_color != BlackPixel(display, DefaultScreen(display))) && 
(menu->s_frg_color != WhitePixel(display, DefaultScreen(display))))
        XFreeColors(
!                   display,
                    DefaultColormap(display, DefaultScreen(display)),
!                   &menu->s_frg_color,
                    1, 0);
      if ((menu->bkgnd_color != BlackPixel(display, DefaultScreen(display))) && 
(menu->bkgnd_color != WhitePixel(display, DefaultScreen(display))))
        XFreeColors(
!                   display,
                    DefaultColormap(display, DefaultScreen(display)),
!                   &menu->bkgnd_color,
                    1, 0);
  
      /*