Subject: 2.0.44-almost fixits

From: Andrew Veliath <[email-masked]>
Date: Tue, 7 Jan 1997 17:53:17 -0500 (EST)

Looking really good Chuck!

The following patch corrects some conditionals I missed.

Regards,
Andrew

diff -cr orig/fvwm-2.0.44-almost/fvwm/borders.c fvwm-2.0.44-almost/fvwm/borders.c
*** orig/fvwm-2.0.44-almost/fvwm/borders.c	Mon Dec 23 17:07:45 1996
--- fvwm-2.0.44-almost/fvwm/borders.c	Tue Jan  7 17:35:58 1997
***************
*** 587,593 ****
  	break;
  #endif /* VECTOR_BUTTONS */
  	
! #if PIXMAP_BUTTONS
  #ifdef MINI_ICONS
      case MiniIconButton:
      case PixmapButton:
--- 587,593 ----
  	break;
  #endif /* VECTOR_BUTTONS */
  	
! #ifdef PIXMAP_BUTTONS
  #ifdef MINI_ICONS
      case MiniIconButton:
      case PixmapButton:
diff -cr orig/fvwm-2.0.44-almost/fvwm/colors.c fvwm-2.0.44-almost/fvwm/colors.c
*** orig/fvwm-2.0.44-almost/fvwm/colors.c	Mon Dec 30 14:03:30 1996
--- fvwm-2.0.44-almost/fvwm/colors.c	Tue Jan  7 17:28:07 1997
***************
*** 138,148 ****
    Scr.ScratchGC2 = XCreateGC(dpy, Scr.Root, gcm, &gcv);
    Scr.ScratchGC3 = XCreateGC(dpy, Scr.Root, gcm, &gcv);
  
! #ifdef XPM
! #if defined(PIXMAP_BUTTONS) || defined(PIXMAP_TITLEBARS)
    /* create button transparency GC */
    Scr.TransMaskGC = XCreateGC(dpy, Scr.Root, gcm, &gcv);
- #endif
  #endif
  }
  
--- 138,146 ----
    Scr.ScratchGC2 = XCreateGC(dpy, Scr.Root, gcm, &gcv);
    Scr.ScratchGC3 = XCreateGC(dpy, Scr.Root, gcm, &gcv);
  
! #if defined(PIXMAP_BUTTONS) || defined(GRADIENT_BUTTONS)
    /* create button transparency GC */
    Scr.TransMaskGC = XCreateGC(dpy, Scr.Root, gcm, &gcv);
  #endif
  }
  
diff -cr orig/fvwm-2.0.44-almost/fvwm/screen.h fvwm-2.0.44-almost/fvwm/screen.h
*** orig/fvwm-2.0.44-almost/fvwm/screen.h	Mon Dec 23 17:07:47 1996
--- fvwm-2.0.44-almost/fvwm/screen.h	Tue Jan  7 17:28:11 1997
***************
*** 255,262 ****
    MyFont StdFont;     	/* font structure */
    MyFont WindowFont;   	/* font structure for window titles */
    MyFont IconFont;      /* for icon labels */
!   
    GC TransMaskGC;               /* GC for transparency masks */
    GC DrawGC;			/* GC to draw lines for move and resize */
    GC MenuGC;
    GC MenuStippleGC;
--- 255,264 ----
    MyFont StdFont;     	/* font structure */
    MyFont WindowFont;   	/* font structure for window titles */
    MyFont IconFont;      /* for icon labels */
! 
! #if defined(PIXMAP_BUTTONS) || defined(GRADIENT_BUTTONS)
    GC TransMaskGC;               /* GC for transparency masks */
+ #endif
    GC DrawGC;			/* GC to draw lines for move and resize */
    GC MenuGC;
    GC MenuStippleGC;

--
Visit the official FVWM web page at <URL:http://www.hpc.uh.edu/fvwm/>.
To unsubscribe from the list, send "unsubscribe fvwm-workers" in the
body of a message to [email-masked].
To report problems, send mail to [email-masked].