From 9b97a17eb728152cebe16d53d842c950a85b3505 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Tue, 5 Nov 2002 22:53:40 +0000 Subject: GObjectify GObjectify GObjectify use GObject api for models use GObject 2002-11-05 Mike Kestner * e-table-col.[ch] : GObjectify * e-table-column-specification.[ch] : GObjectify * e-table-config.[ch] : GObjectify * e-table-group-leaf.c : use GObject api for models * e-table-group.c : use GObject api for models * e-table-header-item.c : use GObject api for models * e-table-header.c : use GObject api for models * e-table-selection-model.c : use GObject api for models * e-table-sort-info.[ch] : GObjectify * e-table-sorted.[ch] : GObjectify * e-table-sorter.c : use GObject api for models * e-table-specification.c : use GObject api for models * e-table-state.[ch] : GObjectify * e-table-subset-variable.[ch] : GObjectify * e-table-subset.[ch] : GObjectify * e-table.c : use GObject api for models svn path=/trunk/; revision=18571 --- widgets/table/e-table-sort-info.h | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'widgets/table/e-table-sort-info.h') diff --git a/widgets/table/e-table-sort-info.h b/widgets/table/e-table-sort-info.h index 7a398fbb85..4710fbd453 100644 --- a/widgets/table/e-table-sort-info.h +++ b/widgets/table/e-table-sort-info.h @@ -24,18 +24,17 @@ #ifndef _E_TABLE_SORT_INFO_H_ #define _E_TABLE_SORT_INFO_H_ -#include +#include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_TABLE_SORT_INFO_TYPE (e_table_sort_info_get_type ()) -#define E_TABLE_SORT_INFO(o) (GTK_CHECK_CAST ((o), E_TABLE_SORT_INFO_TYPE, ETableSortInfo)) -#define E_TABLE_SORT_INFO_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_SORT_INFO_TYPE, ETableSortInfoClass)) -#define E_IS_TABLE_SORT_INFO(o) (GTK_CHECK_TYPE ((o), E_TABLE_SORT_INFO_TYPE)) -#define E_IS_TABLE_SORT_INFO_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SORT_INFO_TYPE)) +#define E_TABLE_SORT_INFO(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_SORT_INFO_TYPE, ETableSortInfo)) +#define E_TABLE_SORT_INFO_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_SORT_INFO_TYPE, ETableSortInfoClass)) +#define E_IS_TABLE_SORT_INFO(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_SORT_INFO_TYPE)) +#define E_IS_TABLE_SORT_INFO_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_SORT_INFO_TYPE)) +#define E_TABLE_SORT_INFO_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TABLE_SORT_INFO_TYPE, ETableSortInfoClass)) typedef struct _ETableSortColumn ETableSortColumn; @@ -45,7 +44,7 @@ struct _ETableSortColumn { }; typedef struct { - GtkObject base; + GObject base; gint group_count; ETableSortColumn *groupings; @@ -60,7 +59,7 @@ typedef struct { } ETableSortInfo; typedef struct { - GtkObjectClass parent_class; + GObjectClass parent_class; /* * Signals @@ -69,7 +68,7 @@ typedef struct { void (*group_info_changed) (ETableSortInfo *info); } ETableSortInfoClass; -GtkType e_table_sort_info_get_type (void); +GType e_table_sort_info_get_type (void); void e_table_sort_info_freeze (ETableSortInfo *info); void e_table_sort_info_thaw (ETableSortInfo *info); @@ -103,8 +102,6 @@ void e_table_sort_info_set_can_group (ETableSortInfo *info, gboolean can_group); gboolean e_table_sort_info_get_can_group (ETableSortInfo *info); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_TABLE_SORT_INFO_H_ */ -- cgit v1.2.3