diff options
| author | Tom Tromey <tromey@redhat.com> | 1996-08-02 02:43:27 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 1996-08-02 02:43:27 +0000 |
| commit | 047465fd1b79902bf20b24f220cc0cdde08746c4 (patch) | |
| tree | 40349f944c99dee41a4571f0d8e0d205c0b6e1e8 /gdb/gdbtk.c | |
| parent | 2934d1c9258c32d0eae590e686f13304429a759e (diff) | |
| download | gdb-047465fd1b79902bf20b24f220cc0cdde08746c4.zip gdb-047465fd1b79902bf20b24f220cc0cdde08746c4.tar.gz gdb-047465fd1b79902bf20b24f220cc0cdde08746c4.tar.bz2 | |
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.
Diffstat (limited to 'gdb/gdbtk.c')
| -rw-r--r-- | gdb/gdbtk.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/gdb/gdbtk.c b/gdb/gdbtk.c index b6a2ea7..1237ef5 100644 --- a/gdb/gdbtk.c +++ b/gdb/gdbtk.c @@ -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 */ |