diff options
Diffstat (limited to 'widgets/table/e-table-one.h')
| -rw-r--r-- | widgets/table/e-table-one.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/widgets/table/e-table-one.h b/widgets/table/e-table-one.h index 40dedba16d..0835ba930c 100644 --- a/widgets/table/e-table-one.h +++ b/widgets/table/e-table-one.h @@ -26,16 +26,14 @@ #include <gal/e-table/e-table-model.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - +G_BEGIN_DECLS #define E_TABLE_ONE_TYPE (e_table_one_get_type ()) -#define E_TABLE_ONE(o) (GTK_CHECK_CAST ((o), E_TABLE_ONE_TYPE, ETableOne)) -#define E_TABLE_ONE_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TABLE_ONE_TYPE, ETableOneClass)) -#define E_IS_TABLE_ONE(o) (GTK_CHECK_TYPE ((o), E_TABLE_ONE_TYPE)) -#define E_IS_TABLE_ONE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_ONE_TYPE)) +#define E_TABLE_ONE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_ONE_TYPE, ETableOne)) +#define E_TABLE_ONE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_ONE_TYPE, ETableOneClass)) +#define E_IS_TABLE_ONE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_ONE_TYPE)) +#define E_IS_TABLE_ONE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_ONE_TYPE)) +#define E_TABLE_ONE_GET_CLASS(o) (G_TYPE_CHECK_CLASS_CAST((o), E_TABLE_ONE_TYPE, ETableOneClass)) typedef struct { ETableModel parent; @@ -48,14 +46,12 @@ typedef struct { ETableModelClass parent_class; } ETableOneClass; -GtkType e_table_one_get_type (void); +GType e_table_one_get_type (void); ETableModel *e_table_one_new (ETableModel *source); void e_table_one_commit (ETableOne *one); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_TABLE_ONE_H_ */ |