--- rxvt-unicode/src/defaultfont.h	2003/12/18 04:14:30	1.7
+++ rxvt-unicode/src/defaultfont.h	2004/02/13 12:16:21	1.11
@@ -1,9 +1,5 @@
-/*
- * $Id: defaultfont.h,v 1.7 2003/12/18 04:14:30 pcg Exp $
- */
-
-#ifndef _DEFAULTFONT_H_
-#define _DEFAULTFONT_H_
+#ifndef DEFAULTFONT_H_
+#define DEFAULTFONT_H_
 
 #ifdef HAVE_XSETLOCALE
 # define X_LOCALE
@@ -21,16 +17,15 @@
 #include "rxvtlib.h"
 #include "feature.h"
 #include "encoding.h"
-#include "rxvtvec.h"
+#include "rxvtstl.h"
 
 struct rxvt_fontprop {
   enum {
     medium = 100, bold = 200,
     roman  = 0, italic = 100,
   };
-  int height;
-  int weight;
-  int slant;
+  int width, height;
+  int weight, slant;
 };
 
 struct rxvt_font {
@@ -54,7 +49,7 @@
   }
 
   rxvt_font () { name = 0; }
-  ~rxvt_font () { free (name); clear (); };
+  ~rxvt_font () { clear (); free (name); };
 
   void clear_rect (int x, int y, int w, int h, int color);
 
@@ -85,7 +80,7 @@
   void populate (const char *desc);
   int find_font (uint32_t unicode);
 
-  rxvt_font *operator [](int id) const
+  rxvt_font *operator [] (int id) const
   {
     return fonts[id];
   }