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...

	* filter-folder.c: Wheee! This is fun...

	* filter-int.c: Gee, I wonder...

	* filter-label.c: Also ported.

	* filter-option.c: Yep, this too.

	* filter-source.c: And finally this one.

svn path=/trunk/; revision=18495

1 files changed, 21 insertions, 17 deletions

diff --git a/filter/filter-option.h b/filter/filter-option.h
index a296c75602..39418868ab 100644
--- a/filter/filter-option.h
+++ b/filter/filter-option.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
@@ -18,17 +20,21 @@
  * Boston, MA 02111-1307, USA.
  */
 
+
 #ifndef _FILTER_OPTION_H
 #define _FILTER_OPTION_H
 
 #include "filter-element.h"
 
-#define FILTER_OPTION(obj)	GTK_CHECK_CAST (obj, filter_option_get_type (), FilterOption)
-#define FILTER_OPTION_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_option_get_type (), FilterOptionClass)
-#define IS_FILTER_OPTION(obj)      GTK_CHECK_TYPE (obj, filter_option_get_type ())
+#define FILTER_TYPE_OPTION            (filter_option_get_type ())
+#define FILTER_OPTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), FILTER_TYPE_OPTION, FilterOption))
+#define FILTER_OPTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), FILTER_TYPE_OPTION, FilterOptionClass))
+#define IS_FILTER_OPTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FILTER_TYPE_OPTION))
+#define IS_FILTER_OPTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FILTER_TYPE_OPTION))
+#define FILTER_OPTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), FILTER_TYPE_OPTION, FilterOptionClass))
 
-typedef struct _FilterOption	FilterOption;
-typedef struct _FilterOptionClass	FilterOptionClass;
+typedef struct _FilterOption FilterOption;
+typedef struct _FilterOptionClass FilterOptionClass;
 
 struct _filter_option {
 	char *title;		/* button title */
@@ -37,29 +43,27 @@ struct _filter_option {
 };
 
 struct _FilterOption {
-	FilterElement parent;
-	struct _FilterOptionPrivate *priv;
-
+	FilterElement parent_object;
+	
 	const char *type;	/* static memory, type name written to xml */
-
+	
 	GList *options;
 	struct _filter_option *current;
 };
 
 struct _FilterOptionClass {
 	FilterElementClass parent_class;
-
+	
 	/* virtual methods */
-
+	
 	/* signals */
 };
 
-guint		filter_option_get_type	(void);
-FilterOption	*filter_option_new	(void);
+GType filter_option_get_type (void);
+FilterOption *filter_option_new (void);
 
 /* methods */
-void		filter_option_set_current(FilterOption *option, const char *name);
-void		filter_option_add(FilterOption *fo, const char *name, const char *title, const char *code);
+void filter_option_set_current (FilterOption *option, const char *name);
+void filter_option_add (FilterOption *fo, const char *name, const char *title, const char *code);
 
 #endif /* ! _FILTER_OPTION_H */
-