Remove make_data_window

As with the previous patches, unifying the creation and
re-initialization cases for the data window lets us remove
make_data_window in favor of simply using "new".

gdb/ChangeLog
2019-07-17  Tom Tromey  <tom@tromey.com>

	* tui/tui-layout.c (make_data_window): Remove.
	(show_data): Unify creation and re-initialization cases.
This commit is contained in:
Tom Tromey
2019-07-01 14:37:38 -06:00
parent 4a8a5e84a7
commit 0912922656
2 changed files with 7 additions and 15 deletions

View File

@ -1,3 +1,8 @@
2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui-layout.c (make_data_window): Remove.
(show_data): Unify creation and re-initialization cases.
2019-07-17 Tom Tromey <tom@tromey.com> 2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui-layout.c (make_source_window, make_disasm_window): * tui/tui-layout.c (make_source_window, make_disasm_window):

View File

@ -476,18 +476,6 @@ prev_layout (void)
return (enum tui_layout_type) new_layout; return (enum tui_layout_type) new_layout;
} }
static tui_win_info *
make_data_window (int height, int origin_y)
{
tui_win_info *result = new tui_data_window ();
result->reset (height, tui_term_width (), 0, origin_y);
result->make_visible (true);
return result;
}
/* Show the Source/Command layout. */ /* Show the Source/Command layout. */
static void static void
show_source_command (void) show_source_command (void)
@ -581,9 +569,8 @@ show_data (enum tui_layout_type new_layout)
tui_make_all_invisible (); tui_make_all_invisible ();
tui_make_invisible (locator); tui_make_invisible (locator);
if (tui_win_list[DATA_WIN] == nullptr) if (tui_win_list[DATA_WIN] == nullptr)
tui_win_list[DATA_WIN] = make_data_window (data_height, 0); tui_win_list[DATA_WIN] = new tui_data_window ();
else tui_win_list[DATA_WIN]->reset (data_height, tui_term_width (), 0, 0);
tui_win_list[DATA_WIN]->reset (data_height, tui_term_width (), 0, 0);
tui_win_list[DATA_WIN]->make_visible (true); tui_win_list[DATA_WIN]->make_visible (true);
if (new_layout == SRC_DATA_COMMAND) if (new_layout == SRC_DATA_COMMAND)