changes for new tcl/tk:

* gdbtk.c (mainWindow): Deleted.
        (cleanup_init): Don't destroy main window.
        (gdbtk_init): Main window now created by Tk_Init.

        * configure.in: Most X checks now handled automatically by Tk.
        Use new macros to find Tcl/Tk.
        * aclocal.m4: New version for new Tcl/Tk; from Don Libes.
        * config.in, configure: Regenerated.

        * Makefile.in (TCL, TCL_CFLAGS, TK, TK_CFLAGS, X11_CFLAGS,
        X11_LDFLAGS, X11_LIBS): Changed for new Tcl and Tk.
This commit is contained in:
Tom Tromey 1996-08-02 02:43:27 +00:00
parent 2934d1c925
commit 047465fd1b
7 changed files with 586 additions and 1534 deletions

View file

@ -97,10 +97,6 @@ static void get_register PARAMS ((int, void *));
static Tcl_Interp *interp = NULL;
/* Handle for TK main window */
static Tk_Window mainWindow = NULL;
static int x_fd; /* X network socket */
/* This variable is true when the inferior is running. Although it's
@ -1145,10 +1141,6 @@ static void
cleanup_init (ignored)
int ignored;
{
if (mainWindow != NULL)
Tk_DestroyWindow (mainWindow);
mainWindow = NULL;
if (interp != NULL)
Tcl_DeleteInterp (interp);
interp = NULL;
@ -1257,11 +1249,6 @@ gdbtk_init ()
if (!interp)
error ("Tcl_CreateInterp failed");
mainWindow = Tk_CreateMainWindow (interp, NULL, "gdb", "Gdb");
if (!mainWindow)
return; /* DISPLAY probably not set */
if (Tcl_Init(interp) != TCL_OK)
error ("Tcl_Init failed: %s", interp->result);
@ -1305,7 +1292,7 @@ gdbtk_init ()
/* Get the file descriptor for the X server */
x_fd = ConnectionNumber (Tk_Display (mainWindow));
x_fd = ConnectionNumber (Tk_Display (Tk_MainWindow (interp)));
/* Setup for I/O interrupts */