summaryrefslogtreecommitdiff
path: root/gladeui/glade-signal.h
diff options
context:
space:
mode:
authorJohannes Schmid <jhs@gnome.org>2011-01-06 12:47:22 +0100
committerJohannes Schmid <jhs@gnome.org>2011-01-06 12:49:12 +0100
commit618f2aa85028b80cf9c8c39686024d250c94b88a (patch)
tree6d53d59b1e32a247aace6ae6b70ff5186168e149 /gladeui/glade-signal.h
parent145fc771575cdcd532d2e4c72361dda880325e09 (diff)
parent3eb7bea305b33cc3e4e8cfc6e2f24cbee5ac66ce (diff)
downloadglade-618f2aa85028b80cf9c8c39686024d250c94b88a.tar.gz
Merge branch 'master' into signal-tree-model
Conflicts: gladeui/glade-app.h gladeui/glade-signal-editor.c gladeui/glade-signal.h gladeui/glade-widget.c
Diffstat (limited to 'gladeui/glade-signal.h')
-rw-r--r--gladeui/glade-signal.h32
1 files changed, 27 insertions, 5 deletions
diff --git a/gladeui/glade-signal.h b/gladeui/glade-signal.h
index bc753cdd..04bae119 100644
--- a/gladeui/glade-signal.h
+++ b/gladeui/glade-signal.h
@@ -5,18 +5,40 @@
G_BEGIN_DECLS
-#define GLADE_SIGNAL(s) ((GladeSignal *)s)
-#define GLADE_IS_SIGNAL(s) (s != NULL)
+#define GLADE_TYPE_SIGNAL (glade_signal_get_type())
+#define GLADE_SIGNAL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_SIGNAL, GladeSignal))
+#define GLADE_SIGNAL_KLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_SIGNAL, GladeSignalKlass))
+#define GLADE_IS_SIGNAL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_SIGNAL))
+#define GLADE_IS_SIGNAL_KLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_SIGNAL))
+#define GLADE_SIGNAL_GET_KLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GLADE_SIGNAL, GladeSignalKlass))
-typedef struct _GladeSignal GladeSignal;
+typedef struct _GladeSignal GladeSignal;
+typedef struct _GladeSignalKlass GladeSignalKlass;
+typedef struct _GladeSignalPrivate GladeSignalPrivate;
+
+struct _GladeSignal {
+ GObject object;
+
+ GladeSignalPrivate *priv;
+};
+
+struct _GladeSignalKlass {
+ GObjectClass object_class;
+
+ void (* glade_reserved1) (void);
+ void (* glade_reserved2) (void);
+ void (* glade_reserved3) (void);
+ void (* glade_reserved4) (void);
+};
+
+
+GType glade_signal_get_type (void) G_GNUC_CONST;
GladeSignal *glade_signal_new (const gchar *name,
const gchar *handler,
const gchar *userdata,
gboolean after,
gboolean swapped);
-GladeSignal *glade_signal_clone (const GladeSignal *signal);
-void glade_signal_free (GladeSignal *signal);
gboolean glade_signal_equal (const GladeSignal *sig1,
const GladeSignal *sig2);
GladeSignal *glade_signal_read (GladeXmlNode *node);