aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'widgets')
-rw-r--r--widgets/misc/ChangeLog4
-rw-r--r--widgets/misc/e-expander.c24
-rw-r--r--widgets/misc/e-expander.h14
3 files changed, 23 insertions, 19 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 372cd2a576..bf49e8c238 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-14 Rodney Dawes <dobey@ximian.com>
+
+ * e-expander.[ch]: Fix remaining usages of GTK_*EXPANDER* defines
+
2003-12-22 Rodney Dawes <dobey@ximian.com>
Fix for bug #46349
diff --git a/widgets/misc/e-expander.c b/widgets/misc/e-expander.c
index f481b9e1d5..d1164849ad 100644
--- a/widgets/misc/e-expander.c
+++ b/widgets/misc/e-expander.c
@@ -1056,13 +1056,13 @@ e_expander_activate (EExpander *expander)
GtkWidget *
e_expander_new (const gchar *label)
{
- return g_object_new (GTK_TYPE_EXPANDER, "label", label, NULL);
+ return g_object_new (E_TYPE_EXPANDER, "label", label, NULL);
}
GtkWidget *
e_expander_new_with_mnemonic (const gchar *label)
{
- return g_object_new (GTK_TYPE_EXPANDER,
+ return g_object_new (E_TYPE_EXPANDER,
"label", label,
"use_underline", TRUE,
NULL);
@@ -1141,7 +1141,7 @@ e_expander_set_expanded (EExpander *expander,
{
EExpanderPrivate *priv;
- g_return_if_fail (GTK_IS_EXPANDER (expander));
+ g_return_if_fail (E_IS_EXPANDER (expander));
priv = E_EXPANDER_GET_PRIVATE (expander);
@@ -1172,7 +1172,7 @@ e_expander_set_expanded (EExpander *expander,
gboolean
e_expander_get_expanded (EExpander *expander)
{
- g_return_val_if_fail (GTK_IS_EXPANDER (expander), FALSE);
+ g_return_val_if_fail (E_IS_EXPANDER (expander), FALSE);
return E_EXPANDER_GET_PRIVATE (expander)->expanded;
}
@@ -1183,7 +1183,7 @@ e_expander_set_spacing (EExpander *expander,
{
EExpanderPrivate *priv;
- g_return_if_fail (GTK_IS_EXPANDER (expander));
+ g_return_if_fail (E_IS_EXPANDER (expander));
g_return_if_fail (spacing >= 0);
priv = E_EXPANDER_GET_PRIVATE (expander);
@@ -1201,7 +1201,7 @@ e_expander_set_spacing (EExpander *expander,
gint
e_expander_get_spacing (EExpander *expander)
{
- g_return_val_if_fail (GTK_IS_EXPANDER (expander), 0);
+ g_return_val_if_fail (E_IS_EXPANDER (expander), 0);
return E_EXPANDER_GET_PRIVATE (expander)->spacing;
}
@@ -1210,7 +1210,7 @@ void
e_expander_set_label (EExpander *expander,
const gchar *label)
{
- g_return_if_fail (GTK_IS_EXPANDER (expander));
+ g_return_if_fail (E_IS_EXPANDER (expander));
if (!label)
{
@@ -1250,7 +1250,7 @@ e_expander_get_label (EExpander *expander)
{
EExpanderPrivate *priv;
- g_return_val_if_fail (GTK_IS_EXPANDER (expander), NULL);
+ g_return_val_if_fail (E_IS_EXPANDER (expander), NULL);
priv = E_EXPANDER_GET_PRIVATE (expander);
@@ -1266,7 +1266,7 @@ e_expander_set_use_underline (EExpander *expander,
{
EExpanderPrivate *priv;
- g_return_if_fail (GTK_IS_EXPANDER (expander));
+ g_return_if_fail (E_IS_EXPANDER (expander));
priv = E_EXPANDER_GET_PRIVATE (expander);
@@ -1286,7 +1286,7 @@ e_expander_set_use_underline (EExpander *expander,
gboolean
e_expander_get_use_underline (EExpander *expander)
{
- g_return_val_if_fail (GTK_IS_EXPANDER (expander), FALSE);
+ g_return_val_if_fail (E_IS_EXPANDER (expander), FALSE);
return E_EXPANDER_GET_PRIVATE (expander)->use_underline;
}
@@ -1306,7 +1306,7 @@ e_expander_set_label_widget (EExpander *expander,
EExpanderPrivate *priv;
gboolean need_resize = FALSE;
- g_return_if_fail (GTK_IS_EXPANDER (expander));
+ g_return_if_fail (E_IS_EXPANDER (expander));
g_return_if_fail (label_widget == NULL || GTK_IS_WIDGET (label_widget));
g_return_if_fail (label_widget == NULL || label_widget->parent == NULL);
@@ -1348,7 +1348,7 @@ e_expander_set_label_widget (EExpander *expander,
GtkWidget *
e_expander_get_label_widget (EExpander *expander)
{
- g_return_val_if_fail (GTK_IS_EXPANDER (expander), NULL);
+ g_return_val_if_fail (E_IS_EXPANDER (expander), NULL);
return E_EXPANDER_GET_PRIVATE (expander)->label_widget;
}
diff --git a/widgets/misc/e-expander.h b/widgets/misc/e-expander.h
index 0f484932d2..fa231729a4 100644
--- a/widgets/misc/e-expander.h
+++ b/widgets/misc/e-expander.h
@@ -28,13 +28,13 @@
G_BEGIN_DECLS
-#define GTK_TYPE_EXPANDER (e_expander_get_type ())
-#define E_EXPANDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EXPANDER, EExpander))
-#define E_EXPANDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_EXPANDER, EExpanderClass))
-#define GTK_IS_EXPANDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_EXPANDER))
-#define GTK_IS_EXPANDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_EXPANDER))
-#define E_EXPANDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_EXPANDER, EExpanderClass))
-/* ESTUFF #define E_EXPANDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_EXPANDER, EExpanderPrivate)) */
+#define E_TYPE_EXPANDER (e_expander_get_type ())
+#define E_EXPANDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_EXPANDER, EExpander))
+#define E_EXPANDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_EXPANDER, EExpanderClass))
+#define E_IS_EXPANDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_EXPANDER))
+#define E_IS_EXPANDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_EXPANDER))
+#define E_EXPANDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_EXPANDER, EExpanderClass))
+/* ESTUFF #define E_EXPANDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), E_TYPE_EXPANDER, EExpanderPrivate)) */
typedef struct _EExpander EExpander;
typedef struct _EExpanderClass EExpanderClass;