From a30cb6dabb20e26dc80b0952ae709613372359f8 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 1 Jul 2020 21:21:12 -0600 Subject: [PATCH] Derive tui_locator_window from tui_win_info tui_locator_window is the last remaining concrete child class of tui_gen_win_info. It seems a bit cleaner to me to flatten the hierarchy a bit; this patch prepares for that by changing tui_locator_window to derive from tui_win_info. gdb/ChangeLog 2020-07-01 Tom Tromey * tui/tui-stack.h (struct tui_locator_window): Derive from tui_win_info. : New methods. : New method. --- gdb/ChangeLog | 7 +++++++ gdb/tui/tui-stack.h | 17 ++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 294e24fc17..52eae109ee 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2020-07-01 Tom Tromey + + * tui/tui-stack.h (struct tui_locator_window): Derive from + tui_win_info. + : New methods. + : New method. + 2020-07-01 Tom Tromey * tui/tui-stack.h (struct tui_locator_window): Remove body. diff --git a/gdb/tui/tui-stack.h b/gdb/tui/tui-stack.h index 0253767ad9..564ac22495 100644 --- a/gdb/tui/tui-stack.h +++ b/gdb/tui/tui-stack.h @@ -28,7 +28,7 @@ struct frame_info; /* Locator window class. */ -struct tui_locator_window : public tui_gen_win_info +struct tui_locator_window : public tui_win_info { tui_locator_window () = default; @@ -42,6 +42,11 @@ struct tui_locator_window : public tui_gen_win_info return 1; } + bool can_box () const override + { + return false; + } + void rerender () override; /* Update the locator, with the provided arguments. @@ -62,6 +67,16 @@ struct tui_locator_window : public tui_gen_win_info /* Architecture associated with code at this location. */ struct gdbarch *gdbarch = nullptr; +protected: + + void do_scroll_vertical (int n) override + { + } + + void do_scroll_horizontal (int n) override + { + } + private: /* Create the status line to display as much information as we can -- 2.34.1