From 01087a552ccb3eadc44a8147e8282c521fec9a21 Mon Sep 17 00:00:00 2001 From: James Bursa Date: Wed, 7 Apr 2010 16:52:45 +0000 Subject: Put status bar and horizontal scroll bar next to each other. Each tab now contains a table containing a layout, status label, and scroll bars. The GtkLayout replaces ScrolledWindow->Fixed->DrawingArea. svn path=/trunk/netsurf/; revision=10277 --- gtk/gtk_tabs.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gtk/gtk_tabs.c') diff --git a/gtk/gtk_tabs.c b/gtk/gtk_tabs.c index 286c388d8..f1451ffb0 100644 --- a/gtk/gtk_tabs.c +++ b/gtk/gtk_tabs.c @@ -58,21 +58,18 @@ void nsgtk_tab_init(GtkWidget *tabs) nsgtk_tab_options_changed(tabs); } -void nsgtk_tab_add(struct gui_window *window, bool background) +void nsgtk_tab_add(struct gui_window *window, GtkWidget *tab_contents, bool background) { GtkWidget *tabs = GTK_WIDGET(nsgtk_scaffolding_notebook( nsgtk_get_scaffold(window))); GtkWidget *tabBox = nsgtk_tab_label_setup(window); gint remember = gtk_notebook_get_current_page(GTK_NOTEBOOK(tabs)); - gtk_notebook_append_page(GTK_NOTEBOOK(tabs), - GTK_WIDGET(nsgtk_window_get_scrolledwindow(window)), - tabBox); + gtk_notebook_append_page(GTK_NOTEBOOK(tabs), tab_contents, tabBox); /*causes gtk errors can't set a parent */ gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(tabs), - GTK_WIDGET(nsgtk_window_get_scrolledwindow(window)), + tab_contents, true); - gtk_widget_show_all(GTK_WIDGET(nsgtk_window_get_scrolledwindow( - window))); + gtk_widget_show_all(tab_contents); gtk_notebook_set_current_page(GTK_NOTEBOOK(tabs), gtk_notebook_get_n_pages(GTK_NOTEBOOK(tabs)) - 1); if (option_new_blank) { -- cgit v1.2.3