--- rxvt-unicode/src/rxvtlib.h.in	2006/01/15 06:02:41	1.65
+++ rxvt-unicode/src/rxvtlib.h.in	2006/01/17 10:14:26	1.69
@@ -62,12 +62,9 @@
 
 extern rxvt_t rxvt_current_term;
 
-#define SET_R(r) rxvt_current_term = (r)
+#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
 #define GET_R rxvt_current_term
 
-#define scrollbar_visible()    scrollBar.state
-#define menubar_visible()      menuBar.state
-
 typedef struct {
   int row;
   int col;
@@ -218,12 +215,6 @@
 /* ------------------------------------------------------------------------- */
 
 typedef struct {
-  short           state;
-  Window          win;
-  struct rxvt_drawable *drawable;
-} menuBar_t;
-
-typedef struct {
   char            state;        /* scrollbar state                          */
   char            init;         /* scrollbar has been initialised           */
   unsigned int    beg;          /* slider sub-window begin height           */
@@ -243,7 +234,6 @@
 
 struct rxvt_vars : TermWin_t {
   scrollBar_t     scrollBar;
-  menuBar_t       menuBar;
   uint32_t        options;
   XSizeHints      szHint;
   rxvt_display   *display;
@@ -255,7 +245,6 @@
   short           numpix_colors;
   Cursor          TermWin_cursor;       /* cursor for vt window */
   int             sb_shadow;    /* scrollbar shadow width                    */
-  rxvt_ptytty     pty;
   int             numlock_state;
   line_t         *row_buf;      // all lines, scrollback + terminal, circular, followed by temp_buf
   line_t         *drawn_buf;    // text on screen