*** main.cc.orig	Fri May  3 08:27:22 1996
--- main.cc	Thu Jul 15 16:42:31 1999
***************
*** 162,168 ****
  		else {
  			Tk_Window tk = t.tkmain();
  			Tk_Uid uid = Tk_GetUid((char*)argv[1]);
! 			XFontStruct* p = Tk_GetFontStruct(t.interp(), tk, uid);
  			t.result(p != 0 ? "1" : "0");
  		}
  		return (TCL_OK);
--- 162,168 ----
  		else {
  			Tk_Window tk = t.tkmain();
  			Tk_Uid uid = Tk_GetUid((char*)argv[1]);
! 			Tk_Font p = Tk_GetFont(t.interp(), tk, uid);
  			t.result(p != 0 ? "1" : "0");
  		}
  		return (TCL_OK);
***************
*** 356,362 ****
  	Tk_DefineBitmap(tcl, Tk_GetUid("linein2"),
  			linein2_bits, linein2_width, linein2_height);
  	Tk_DefineBitmap(tcl, Tk_GetUid("linein3"),
! 			linein3_bits, linein3_width, linein3_height);
  	Tk_DefineBitmap(tcl, Tk_GetUid("square"),
  			square_bits, square_width, square_height);
  }
--- 356,362 ----
  	Tk_DefineBitmap(tcl, Tk_GetUid("linein2"),
  			linein2_bits, linein2_width, linein2_height);
  	Tk_DefineBitmap(tcl, Tk_GetUid("linein3"),
! 			(char *) linein3_bits, linein3_width, linein3_height);
  	Tk_DefineBitmap(tcl, Tk_GetUid("square"),
  			square_bits, square_width, square_height);
  }
