--- rxvt-unicode/src/rxvtfont.h	2006/01/17 05:47:42	1.18
+++ rxvt-unicode/src/rxvtfont.h	2006/01/30 04:27:17	1.20
@@ -39,15 +39,15 @@
 };
 
 struct rxvt_drawable {
-  rxvt_display *display;
+  rxvt_screen *screen;
 #if XFT
   XftDraw *xftdrawable;
   operator XftDraw *();
 #endif
   Drawable drawable;
 
-  rxvt_drawable (rxvt_display *display, Drawable drawable)
-  : display(display),
+  rxvt_drawable (rxvt_screen *screen, Drawable drawable)
+  : screen(screen),
 #if XFT
     xftdrawable(0),
 #endif
@@ -76,7 +76,7 @@
 
   void set_name (char *name);
 
-  rxvt_font () { name = 0; }
+  rxvt_font ();
   virtual ~rxvt_font () { free (name); };
 
   virtual void clear () { };