diff options
| author | Tom Tromey <tom@tromey.com> | 2020-07-01 21:21:12 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2020-07-01 21:21:17 -0600 |
| commit | 32c1e2100975c073b3c1d9e2041de9f74b6e2049 (patch) | |
| tree | 6a8287214e60beafd26e079057083fa2b61d6d93 /gdb/tui/tui-wingeneral.c | |
| parent | a30cb6dabb20e26dc80b0952ae709613372359f8 (diff) | |
| download | fsf-binutils-gdb-32c1e2100975c073b3c1d9e2041de9f74b6e2049.zip fsf-binutils-gdb-32c1e2100975c073b3c1d9e2041de9f74b6e2049.tar.gz fsf-binutils-gdb-32c1e2100975c073b3c1d9e2041de9f74b6e2049.tar.bz2 | |
Remove tui_gen_win_info
This merges the tui_gen_win_info base class with tui_win_info;
renaming the resulting class to tui_win_info.
gdb/ChangeLog
2020-07-01 Tom Tromey <tom@tromey.com>
* tui/tui-wingeneral.c (tui_win_info::refresh_window): Move from
tui_gen_win_info.
(tui_win_info::make_window): Merge with
tui_gen_win_info::make_window.
(tui_win_info::make_visible): Move from tui_gen_win_info.
* tui/tui-win.c (tui_win_info::max_width): Move from
tui_gen_win_info.
* tui/tui-layout.h (class tui_layout_window) <m_window>: Change
type.
<window_factory>: Likewise.
* tui/tui-layout.c (tui_win_info::resize): Move from
tui_gen_win_info.
(make_standard_window): Change return type.
(get_locator_window, tui_get_window_by_name): Likewise.
(tui_layout_window::apply): Remove a cast.
* tui/tui-data.h (MIN_WIN_HEIGHT): Move earlier.
(struct tui_win_info): Merge with tui_gen_win_info.
(struct tui_gen_win_info): Remove.
Diffstat (limited to 'gdb/tui/tui-wingeneral.c')
| -rw-r--r-- | gdb/tui/tui-wingeneral.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c index 35468d4..504f915 100644 --- a/gdb/tui/tui-wingeneral.c +++ b/gdb/tui/tui-wingeneral.c @@ -71,7 +71,7 @@ tui_wrefresh (WINDOW *win) /* See tui-data.h. */ void -tui_gen_win_info::refresh_window () +tui_win_info::refresh_window () { if (handle != NULL) tui_wrefresh (handle.get ()); @@ -166,9 +166,8 @@ tui_win_info::check_and_display_highlight_if_needed () } } - void -tui_gen_win_info::make_window () +tui_win_info::make_window () { handle.reset (newwin (height, width, y, x)); if (handle != NULL) @@ -176,22 +175,16 @@ tui_gen_win_info::make_window () if (suppress_output) wnoutrefresh (handle.get ()); scrollok (handle.get (), TRUE); + if (can_box ()) + box_win (this, false); } } -void -tui_win_info::make_window () -{ - tui_gen_win_info::make_window (); - if (handle != NULL && can_box ()) - box_win (this, false); -} - /* We can't really make windows visible, or invisible. So we have to delete the entire window when making it visible, and create it again when making it visible. */ void -tui_gen_win_info::make_visible (bool visible) +tui_win_info::make_visible (bool visible) { if (is_visible () == visible) return; |