diff options
| author | Chris Toshok <toshok@ximian.com> | 2002-11-15 08:23:44 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2002-11-15 08:23:44 +0800 |
| commit | 27fbc0098ca72b45e0c287027940bee5c048e2b7 (patch) | |
| tree | cafe6111804b99ef3aae482bf7c52777a6af6803 /widgets/table/e-table-without.c | |
| parent | c27902bcebc0ce445bb19bd315f40f5d672ace20 (diff) | |
| download | gsoc2013-evolution-27fbc0098ca72b45e0c287027940bee5c048e2b7.tar.gz gsoc2013-evolution-27fbc0098ca72b45e0c287027940bee5c048e2b7.tar.zst gsoc2013-evolution-27fbc0098ca72b45e0c287027940bee5c048e2b7.zip | |
this subclasses from GObject now, not GtkObject. don't use GtkObject
2002-11-14 Chris Toshok <toshok@ximian.com>
* e-table-without.[ch]: this subclasses from GObject now, not
GtkObject. don't use GtkObject (especially casts to it) inside
the code.
* e-table-config-no-group.glade: libglade-convert.
* e-table-config.glade: same.
* e-table-field-chooser.glade: same.
* e-table-group.glade: same.
svn path=/trunk/; revision=18766
Diffstat (limited to 'widgets/table/e-table-without.c')
| -rw-r--r-- | widgets/table/e-table-without.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c index 88f14c63cb..e49076be0f 100644 --- a/widgets/table/e-table-without.c +++ b/widgets/table/e-table-without.c @@ -24,12 +24,9 @@ #include <config.h> #include <stdlib.h> #include <string.h> -#include <gtk/gtksignal.h> #include "gal/util/e-util.h" #include "e-table-without.h" -#define ETW_CLASS(e) ((ETableWithoutClass *)((GtkObject *)e)->klass) - #define PARENT_TYPE E_TABLE_SUBSET_TYPE #define INCREMENT_AMOUNT 10 @@ -130,7 +127,7 @@ delete_hash_element (gpointer key, } static void -etw_destroy (GtkObject *object) +etw_dispose (GObject *object) { ETableWithout *etw = E_TABLE_WITHOUT (object); @@ -144,8 +141,8 @@ etw_destroy (GtkObject *object) etw->priv = NULL; } - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (G_OBJECT_CLASS (parent_class)->dispose) + (* G_OBJECT_CLASS (parent_class)->dispose) (object); } static void @@ -225,11 +222,11 @@ static void etw_class_init (ETableWithoutClass *klass) { ETableSubsetClass *etss_class = E_TABLE_SUBSET_CLASS (klass); - GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref (PARENT_TYPE); - object_class->destroy = etw_destroy; + object_class->dispose = etw_dispose; etss_class->proxy_model_rows_inserted = etw_proxy_model_rows_inserted; etss_class->proxy_model_rows_deleted = etw_proxy_model_rows_deleted; @@ -288,7 +285,7 @@ e_table_without_new (ETableModel *source, ETableWithoutFreeKeyFunc free_duplicated_key_func, void *closure) { - ETableWithout *etw = gtk_type_new (E_TABLE_WITHOUT_TYPE); + ETableWithout *etw = g_object_new (E_TABLE_WITHOUT_TYPE, NULL); if (e_table_without_construct (etw, source, |