--- Frodo4/Src/C64_x.h	2003/07/01 17:28:51	1.1
+++ Frodo4/Src/C64_x.h	2003/07/09 13:51:13	1.4
@@ -1,7 +1,7 @@
 /*
  *  C64_x.h - Put the pieces together, X specific stuff
  *
- *  Frodo (C) 1994-1997,2002 Christian Bauer
+ *  Frodo (C) 1994-1997,2002-2003 Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -113,7 +113,7 @@ void C64::c64_ctor1(void)
 	gui = 0;
 #else
 	// try to start up Tk gui.
-	gui = new CmdPipe("wish", "TkGui.tcl");
+	gui = new CmdPipe("wish", BINDIR "Frodo_GUI.tcl");
 	if (gui) {
 		if (gui->fail) {
 			delete gui; gui = 0;
@@ -262,7 +262,7 @@ void C64::VBlank(bool draw_frame)
  *  joystick preferences
  */
 
-void C64::open_close_joysticks(bool oldjoy1, bool oldjoy2, bool newjoy1, bool newjoy2)
+void C64::open_close_joysticks(int oldjoy1, int oldjoy2, int newjoy1, int newjoy2)
 {
 #ifdef HAVE_LINUX_JOYSTICK_H
 	if (oldjoy1 != newjoy1) {