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.

svn path=/trunk/; revision=18492

1 files changed, 19 insertions, 16 deletions

diff --git a/filter/filter-input.h b/filter/filter-input.h
index ab03391116..760548c3b3 100644
--- a/filter/filter-input.h
+++ b/filter/filter-input.h
@@ -1,7 +1,9 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000 Ximian Inc.
+ *  Copyright (C) 2000-2002 Ximian Inc.
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
+ *           Jeffrey Stedfast <fejj@ximian.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
@@ -23,36 +25,37 @@
 
 #include "filter-element.h"
 
-#define FILTER_INPUT(obj)	GTK_CHECK_CAST (obj, filter_input_get_type (), FilterInput)
-#define FILTER_INPUT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_input_get_type (), FilterInputClass)
-#define IS_FILTER_INPUT(obj)      GTK_CHECK_TYPE (obj, filter_input_get_type ())
+#define FILTER_TYPE_INPUT            (filter_input_get_type ())
+#define FILTER_INPUT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), FILTER_TYPE_INPUT, FilterInput))
+#define FILTER_INPUT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), FILTER_TYPE_INPUT, FilterInputClass))
+#define IS_FILTER_INPUT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FILTER_TYPE_INPUT))
+#define IS_FILTER_INPUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FILTER_TYPE_INPUT))
+#define FILTER_INPUT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), FILTER_TYPE_INPUT, FilterInputClass))
 
-typedef struct _FilterInput	FilterInput;
-typedef struct _FilterInputClass	FilterInputClass;
+typedef struct _FilterInput FilterInput;
+typedef struct _FilterInputClass FilterInputClass;
 
 struct _FilterInput {
-	FilterElement parent;
-	struct _FilterInputPrivate *priv;
-
+	FilterElement parent_object;
+	
 	char *type;		/* name of type */
 	GList *values;		/* strings */
 };
 
 struct _FilterInputClass {
 	FilterElementClass parent_class;
-
+	
 	/* virtual methods */
-
+	
 	/* signals */
 };
 
-guint		filter_input_get_type	(void);
-FilterInput	*filter_input_new	(void);
+GType filter_input_get_type (void);
+FilterInput *filter_input_new (void);
 
-FilterInput	*filter_input_new_type_name	(const char *type);
+FilterInput *filter_input_new_type_name (const char *type);
 
 /* methods */
-void		filter_input_set_value(FilterInput *fi, const char *value);
+void filter_input_set_value (FilterInput *fi, const char *value);
 
 #endif /* ! _FILTER_INPUT_H */
-