callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure the ETable is constructed properly, by setting the

Browse Source 
arguments in the parent EScrollFrame class.

svn path=/trunk/; revision=4063
This commit is contained in:
Ettore Perazzoli
2000-07-10 22:57:03 +00:00
parent 6d83f3ed17
commit 0b7919fc13
5 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
widgets/e-table/ChangeLog
View File

@ -1,3 +1,15 @@
2000-07-10 Ettore Perazzoli <ettore@helixcode.com>
* e-table.c (set_scroll_adjustments): Be safe if @vadjustment is
NULL.
* e-table-scrolled.c (e_table_scrolled_init): Set policy and
shadow type.
(e_table_scrolled_real_construct): Don't set the adjustments.
(e_table_scrolled_new): Create the widget with `gtk_widget_new()'
and pass hadjustment/vadjustment NULL values so that we get the
`GTK_OBJECT_CONSTRUCTED' approval.
2000-07-10 Ettore Perazzoli <ettore@helixcode.com>
* e-table-scrolled.h: s/GtkTable/EScrollFrameClass/.

16
widgets/e-table/e-table-scrolled.c
View File

@ -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);

7
widgets/e-table/e-table.c
View File

@ -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),

16
widgets/table/e-table-scrolled.c
View File

@ -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);

7
widgets/table/e-table.c
View File

@ -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),