From 0b7919fc139f9bd8cd7287bd1c815769f2f0bd56 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Mon, 10 Jul 2000 22:57:03 +0000
Subject: Make sure the ETable is constructed properly, by setting the
 arguments in the parent EScrollFrame class.

svn path=/trunk/; revision=4063
---
 widgets/table/e-table-scrolled.c | 16 ++++++++++++----
 widgets/table/e-table.c          |  7 +++++--
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table-scrolled.c b/widgets/table/e-table-scrolled.c
index 6fcec1e185..b8260b6407 100644
--- a/widgets/table/e-table-scrolled.c
+++ b/widgets/table/e-table-scrolled.c
@@ -94,17 +94,22 @@ key_press_proxy (ETable *et, int row, int col, GdkEvent *event, ETableScrolled *
 static void
 e_table_scrolled_init (GtkObject *object)
 {
-	ETableScrolled *ets = E_TABLE_SCROLLED(object);
+	ETableScrolled *ets;
+	EScrollFrame *scroll_frame;
+
+	ets          = E_TABLE_SCROLLED (object);
+	scroll_frame = E_SCROLL_FRAME   (object);
 
 	ets->table = gtk_type_new(e_table_get_type());
+
+	e_scroll_frame_set_policy      (scroll_frame, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	e_scroll_frame_set_shadow_type (scroll_frame, GTK_SHADOW_IN);
 }
 
 static void
 e_table_scrolled_real_construct (ETableScrolled *ets)
 {
 	gtk_object_set(GTK_OBJECT(ets),
-		       "hadjustment", NULL,
-		       "vadjustment", NULL,
 		       "shadow_type", GTK_SHADOW_IN,
 		       "hscrollbar_policy", GTK_POLICY_NEVER,
 		       "vscrollbar_policy", GTK_POLICY_AUTOMATIC,
@@ -153,7 +158,10 @@ e_table_scrolled_new (ETableHeader *full_header, ETableModel *etm, const char *s
 {
 	ETableScrolled *ets;
 
-	ets = gtk_type_new (e_table_scrolled_get_type ());
+	ets = E_TABLE_SCROLLED (gtk_widget_new (e_table_scrolled_get_type (),
+						"hadjustment", NULL,
+						"vadjustment", NULL,
+						NULL));
 
 	ets = e_table_scrolled_construct (ets, full_header, etm, spec);
 		
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index db7ca11b3f..8a93577dbf 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -823,8 +823,11 @@ set_scroll_adjustments   (ETable *table,
 			  GtkAdjustment *hadjustment,
 			  GtkAdjustment *vadjustment)
 {
-	vadjustment->step_increment = 20;
-	gtk_adjustment_changed(vadjustment);
+	if (vadjustment != NULL) {
+		vadjustment->step_increment = 20;
+		gtk_adjustment_changed(vadjustment);
+	}
+
 	gtk_layout_set_hadjustment (GTK_LAYOUT(table->table_canvas),
 				    hadjustment);
 	gtk_layout_set_vadjustment (GTK_LAYOUT(table->table_canvas),
-- 
cgit