From 75f89dc8698e1d6589c7f5e51c8fe3164584f583 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@ximian.com>
Date: Wed, 6 Nov 2002 00:07:08 +0000
Subject: GObjectify GObjectify

2002-11-05  Mike Kestner  <mkestner@ximian.com>

	* e-table-sorted-variable.[ch] : GObjectify
	* e-tree-sorted-variable.[ch] : GObjectify

svn path=/trunk/; revision=18573
---
 widgets/table/e-table-sorted-variable.h | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'widgets/table/e-table-sorted-variable.h')

diff --git a/widgets/table/e-table-sorted-variable.h b/widgets/table/e-table-sorted-variable.h
index 02b342d3a4..546d04b240 100644
--- a/widgets/table/e-table-sorted-variable.h
+++ b/widgets/table/e-table-sorted-variable.h
@@ -24,21 +24,20 @@
 #ifndef _E_TABLE_SORTED_VARIABLE_H_
 #define _E_TABLE_SORTED_VARIABLE_H_
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 #include <gal/e-table/e-table-model.h>
 #include <gal/e-table/e-table-subset-variable.h>
 #include <gal/e-table/e-table-sort-info.h>
 #include <gal/e-table/e-table-header.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TABLE_SORTED_VARIABLE_TYPE        (e_table_sorted_variable_get_type ())
-#define E_TABLE_SORTED_VARIABLE(o)          (GTK_CHECK_CAST ((o), E_TABLE_SORTED_VARIABLE_TYPE, ETableSortedVariable))
-#define E_TABLE_SORTED_VARIABLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SORTED_VARIABLE_TYPE, ETableSortedVariableClass))
-#define E_IS_TABLE_SORTED_VARIABLE(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SORTED_VARIABLE_TYPE))
-#define E_IS_TABLE_SORTED_VARIABLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SORTED_VARIABLE_TYPE))
+#define E_TABLE_SORTED_VARIABLE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_SORTED_VARIABLE_TYPE, ETableSortedVariable))
+#define E_TABLE_SORTED_VARIABLE_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_SORTED_VARIABLE_TYPE, ETableSortedVariableClass))
+#define E_IS_TABLE_SORTED_VARIABLE(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_SORTED_VARIABLE_TYPE))
+#define E_IS_TABLE_SORTED_VARIABLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_SORTED_VARIABLE_TYPE))
+#define E_TABLE_SORTED_VARIABLE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TABLE_SORTED_VARIABLE_TYPE, ETableSortedVariableClass))
 
 typedef struct {
 	ETableSubsetVariable base;
@@ -58,11 +57,9 @@ typedef struct {
 	ETableSubsetVariableClass parent_class;
 } ETableSortedVariableClass;
 
-GtkType      e_table_sorted_variable_get_type (void);
+GType        e_table_sorted_variable_get_type (void);
 ETableModel *e_table_sorted_variable_new      (ETableModel *etm, ETableHeader *header, ETableSortInfo *sort_info);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_TABLE_SORTED_VARIABLE_H_ */
-- 
cgit v1.2.3