Ported to GObject.

2002-11-01  Jeffrey Stedfast  <fejj@ximian.com>

	* filter-element.c: Ported to GObject.

	* filter-input.c: Same.

	* filter-code.c: This too.

	* filter-colour.c: And this.

	* filter-datespec.c: You guessed it.

	* filter-file.c: And again...

svn path=/trunk/; revision=18493

1 files changed, 11 insertions, 8 deletions

diff --git a/filter/filter-file.h b/filter/filter-file.h
index 173e35c5fb..a3e28d0b5c 100644
--- a/filter/filter-file.h
+++ b/filter/filter-file.h
@@ -31,16 +31,18 @@ extern "C" {
 
 #include "filter-element.h"
 
-#define FILTER_FILE(obj)         GTK_CHECK_CAST (obj, filter_file_get_type (), FilterFile)
-#define FILTER_FILE_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, filter_file_get_type (), FilterFileClass)
-#define IS_FILTER_FILE(obj)      GTK_CHECK_TYPE (obj, filter_file_get_type ())
+#define FILTER_TYPE_FILE            (filter_file_get_type ())
+#define FILTER_FILE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), FILTER_TYPE_FILE, FilterFile))
+#define FILTER_FILE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), FILTER_TYPE_FILE, FilterFileClass))
+#define IS_FILTER_FILE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FILTER_TYPE_FILE))
+#define IS_FILTER_FILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FILTER_TYPE_FILE))
+#define FILTER_FILE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), FILTER_TYPE_FILE, FilterFileClass))
 
-typedef struct _FilterFile	FilterFile;
-typedef struct _FilterFileClass	FilterFileClass;
+typedef struct _FilterFile FilterFile;
+typedef struct _FilterFileClass FilterFileClass;
 
 struct _FilterFile {
-	FilterElement parent;
-	struct _FilterFilePrivate *priv;
+	FilterElement parent_object;
 	
 	char *type;
 	char *path;
@@ -54,7 +56,8 @@ struct _FilterFileClass {
 	/* signals */
 };
 
-GtkType filter_file_get_type (void);
+
+GType filter_file_get_type (void);
 
 FilterFile *filter_file_new (void);