From ed4a1084d725a5d1aecefc6a430d3059a77c102d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 6 Jul 2019 08:23:34 -0600 Subject: [PATCH] Remove FIXMEs from tui-layout.c An earlier patch added a couple of FIXME comments to tui-layout.c. This removes them. This is possible due to the previous patch that changed how boxing works in the TUI -- now, no special case for the command window is needed in box_win. gdb/ChangeLog 2019-08-15 Tom Tromey * tui/tui-layout.c (show_source_disasm_command) (show_source_or_disasm_and_command): Use make_visible method, not tui_make_window. * tui/tui-command.h (struct tui_cmd_window) : Remove. --- gdb/ChangeLog | 8 ++++++++ gdb/tui/tui-command.h | 4 ---- gdb/tui/tui-layout.c | 8 ++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 77f4ca07638..49e01cee373 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2019-08-15 Tom Tromey + + * tui/tui-layout.c (show_source_disasm_command) + (show_source_or_disasm_and_command): Use make_visible method, not + tui_make_window. + * tui/tui-command.h (struct tui_cmd_window) : + Remove. + 2019-08-15 Tom Tromey * tui/tui-wingeneral.h (tui_make_window): Update. diff --git a/gdb/tui/tui-command.h b/gdb/tui/tui-command.h index 14d77500882..1892956fe77 100644 --- a/gdb/tui/tui-command.h +++ b/gdb/tui/tui-command.h @@ -35,10 +35,6 @@ struct tui_cmd_window : public tui_win_info DISABLE_COPY_AND_ASSIGN (tui_cmd_window); - void make_visible (bool visible) override - { - } - int max_height () const override; void refresh_window () override diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 69b929d37b2..c2abcf4429d 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -544,9 +544,7 @@ show_source_disasm_command (void) tui_term_width (), 0, tui_term_height () - cmd_height); - /* FIXME tui_cmd_window won't recreate the handle on - make_visible, so we need this instead. */ - tui_make_window (TUI_CMD_WIN); + TUI_CMD_WIN->make_visible (true); current_layout = SRC_DISASSEM_COMMAND; } @@ -672,8 +670,6 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type) tui_term_width (), 0, src_height); - /* FIXME tui_cmd_window won't recreate the handle on - make_visible, so we need this instead. */ - tui_make_window (TUI_CMD_WIN); + TUI_CMD_WIN->make_visible (true); current_layout = layout_type; } -- 2.30.2