From 695591dd9377db47cd34b169e7c12baa2bc581e6 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Sat, 10 Jun 2000 22:48:14 +0000 Subject: Make ETable use EScrollFrame instead of GtkScrolledWindow. svn path=/trunk/; revision=3515 --- widgets/e-table/ChangeLog | 13 +++++++++++++ widgets/e-table/Makefile.am | 5 +++++ widgets/e-table/e-table.c | 20 +++++++++++++------- widgets/table/e-table.c | 20 +++++++++++++------- 4 files changed, 44 insertions(+), 14 deletions(-) (limited to 'widgets') diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog index 5a6ded8c04..dfaec4ac67 100644 --- a/widgets/e-table/ChangeLog +++ b/widgets/e-table/ChangeLog @@ -1,3 +1,16 @@ +2000-06-11 Ettore Perazzoli + + * Makefile.am (table_test_LDADD): Link with libemiscwidgets.a. + (table_size_test_LDADD): Likewise. + (table_example_1_LDADD): Likewise. + (table_example_2_LDADD): Likewise. + (tree_example_1_LDADD): Likewise. + +2000-06-10 Ettore Perazzoli + + * e-table.c (et_real_construct): EScrollFrame instead of + GtkScrolledWindow. + 2000-06-10 Christopher James Lahey * Makefile.am: Added $(GNOME_PRINT_LIBS) to all of the LDADDs. diff --git a/widgets/e-table/Makefile.am b/widgets/e-table/Makefile.am index 5f7af50a9a..9f21f45cd2 100644 --- a/widgets/e-table/Makefile.am +++ b/widgets/e-table/Makefile.am @@ -95,6 +95,7 @@ table_test_LDADD = \ libetable.a \ $(EXTRA_GNOME_LIBS) \ $(top_builddir)/widgets/e-text/libetext.a \ + $(top_builddir)/widgets/misc/libemiscwidgets.a \ $(top_builddir)/e-util/libeutil.la \ $(GNOME_PRINT_LIBS) @@ -107,6 +108,7 @@ table_size_test_LDADD = \ libetable.a \ $(EXTRA_GNOME_LIBS) \ $(top_builddir)/widgets/e-text/libetext.a \ + $(top_builddir)/widgets/misc/libemiscwidgets.a \ $(top_builddir)/e-util/libeutil.la \ $(GNOME_PRINT_LIBS) @@ -119,6 +121,7 @@ table_example_1_LDADD = \ libetable.a \ $(EXTRA_GNOME_LIBS) \ $(top_builddir)/widgets/e-text/libetext.a \ + $(top_builddir)/widgets/misc/libemiscwidgets.a \ $(top_builddir)/e-util/libeutil.la \ $(GNOME_PRINT_LIBS) @@ -131,6 +134,7 @@ table_example_2_LDADD = \ libetable.a \ $(EXTRA_GNOME_LIBS) \ $(top_builddir)/widgets/e-text/libetext.a \ + $(top_builddir)/widgets/misc/libemiscwidgets.a \ $(top_builddir)/e-util/libeutil.la \ $(GNOME_PRINT_LIBS) @@ -145,6 +149,7 @@ tree_example_1_LDADD = \ libetable.a \ $(EXTRA_GNOME_LIBS) \ $(top_builddir)/widgets/e-text/libetext.a \ + $(top_builddir)/widgets/misc/libemiscwidgets.a \ $(top_builddir)/e-util/libeutil.la \ $(GNOME_PRINT_LIBS) diff --git a/widgets/e-table/e-table.c b/widgets/e-table/e-table.c index 6d0f6409d9..d88daac5db 100644 --- a/widgets/e-table/e-table.c +++ b/widgets/e-table/e-table.c @@ -20,6 +20,9 @@ #include #include #include + +#include "widgets/misc/e-scroll-frame.h" + #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" #include "e-util/e-canvas.h" @@ -447,7 +450,7 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm, int no_header; int row = 0; - GtkWidget *scrolledwindow; + GtkWidget *scrollframe; xmlRoot = xmlDocGetRootElement (xmlSpec); xmlColumns = e_xml_get_child_by_name (xmlRoot, "columns-shown"); @@ -480,23 +483,26 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm, e_table_setup_table (e_table, full_header, e_table->header, etm); e_table_fill_table (e_table, etm); - scrolledwindow = gtk_scrolled_window_new ( + scrollframe = e_scroll_frame_new ( gtk_layout_get_hadjustment (GTK_LAYOUT (e_table->table_canvas)), gtk_layout_get_vadjustment (GTK_LAYOUT (e_table->table_canvas))); gtk_layout_get_vadjustment (GTK_LAYOUT (e_table->table_canvas))->step_increment = 20; gtk_adjustment_changed(gtk_layout_get_vadjustment (GTK_LAYOUT (e_table->table_canvas))); + + e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scrollframe), + GTK_SHADOW_IN); - gtk_scrolled_window_set_policy ( - GTK_SCROLLED_WINDOW (scrolledwindow), + e_scroll_frame_set_policy ( + E_SCROLL_FRAME (scrollframe), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_add ( - GTK_CONTAINER (scrolledwindow), + GTK_CONTAINER (scrollframe), GTK_WIDGET (e_table->table_canvas)); - gtk_widget_show (scrolledwindow); + gtk_widget_show (scrollframe); if (!no_header) { /* @@ -513,7 +519,7 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm, * The body */ gtk_table_attach ( - GTK_TABLE (e_table), GTK_WIDGET (scrolledwindow), + GTK_TABLE (e_table), GTK_WIDGET (scrollframe), 0, 1, 0 + row, 1 + row, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 0); diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 6d0f6409d9..d88daac5db 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -20,6 +20,9 @@ #include #include #include + +#include "widgets/misc/e-scroll-frame.h" + #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" #include "e-util/e-canvas.h" @@ -447,7 +450,7 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm, int no_header; int row = 0; - GtkWidget *scrolledwindow; + GtkWidget *scrollframe; xmlRoot = xmlDocGetRootElement (xmlSpec); xmlColumns = e_xml_get_child_by_name (xmlRoot, "columns-shown"); @@ -480,23 +483,26 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm, e_table_setup_table (e_table, full_header, e_table->header, etm); e_table_fill_table (e_table, etm); - scrolledwindow = gtk_scrolled_window_new ( + scrollframe = e_scroll_frame_new ( gtk_layout_get_hadjustment (GTK_LAYOUT (e_table->table_canvas)), gtk_layout_get_vadjustment (GTK_LAYOUT (e_table->table_canvas))); gtk_layout_get_vadjustment (GTK_LAYOUT (e_table->table_canvas))->step_increment = 20; gtk_adjustment_changed(gtk_layout_get_vadjustment (GTK_LAYOUT (e_table->table_canvas))); + + e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scrollframe), + GTK_SHADOW_IN); - gtk_scrolled_window_set_policy ( - GTK_SCROLLED_WINDOW (scrolledwindow), + e_scroll_frame_set_policy ( + E_SCROLL_FRAME (scrollframe), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_add ( - GTK_CONTAINER (scrolledwindow), + GTK_CONTAINER (scrollframe), GTK_WIDGET (e_table->table_canvas)); - gtk_widget_show (scrolledwindow); + gtk_widget_show (scrollframe); if (!no_header) { /* @@ -513,7 +519,7 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm, * The body */ gtk_table_attach ( - GTK_TABLE (e_table), GTK_WIDGET (scrolledwindow), + GTK_TABLE (e_table), GTK_WIDGET (scrollframe), 0, 1, 0 + row, 1 + row, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 0); -- cgit v1.2.3