Introduce max_height method

[deliverable/binutils-gdb.git] / gdb / tui / tui-source.c

diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index 1fa0e986e0392a6c0b4a4e15dcad774de7697a1e..ac3f225e1b1e0be6c6e9f7b28afb42ef80ebd821 100644 (file)
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -129,7 +129,7 @@ tui_set_source_content (struct symtab *s,
 {
   enum tui_status ret = TUI_FAILURE;
 
-  if (s != (struct symtab *) NULL)
+  if (s != NULL)
     {
       int line_width, nlines;
 
@@ -159,8 +159,8 @@ tui_set_source_content (struct symtab *s,
              int cur_line_no, cur_line;
              struct tui_gen_win_info *locator
                = tui_locator_win_info_ptr ();
-             struct tui_source_info *src
-               = &TUI_SRC_WIN->detail.source_info;
+             struct tui_source_window_base *src
+               = (struct tui_source_window_base *) TUI_SRC_WIN;
              const char *s_filename = symtab_to_filename_for_display (s);
 
              if (TUI_SRC_WIN->generic.title)
@@ -289,7 +289,7 @@ tui_show_symtab_source (struct gdbarch *gdbarch, struct symtab *s,
                        struct tui_line_or_address line, 
                        int noerror)
 {
-  TUI_SRC_WIN->detail.source_info.horizontal_offset = 0;
+  TUI_SRC_WIN->horizontal_offset = 0;
   tui_update_source_window_as_is (TUI_SRC_WIN, gdbarch, s, line, noerror);
 }
 
@@ -309,17 +309,17 @@ tui_source_is_displayed (const char *fullname)
 
 /* Scroll the source forward or backward vertically.  */
 void
-tui_vertical_source_scroll (enum tui_scroll_direction scroll_direction,
-                           int num_to_scroll)
+tui_source_window::do_scroll_vertical
+  (enum tui_scroll_direction scroll_direction, int num_to_scroll)
 {
-  if (TUI_SRC_WIN->generic.content != NULL)
+  if (generic.content != NULL)
     {
       struct tui_line_or_address l;
       struct symtab *s;
-      tui_win_content content = TUI_SRC_WIN->generic.content;
+      tui_win_content content = generic.content;
       struct symtab_and_line cursal = get_current_source_symtab_and_line ();
 
-      if (cursal.symtab == (struct symtab *) NULL)
+      if (cursal.symtab == NULL)
        s = find_pc_line_symtab (get_frame_pc (get_selected_frame (NULL)));
       else
        s = cursal.symtab;