From: Pierre-Luc Beaudoin Date: Sat, 13 Jun 2009 14:23:19 +0000 (-0400) Subject: Rename GTK_CHAMPLAIN_TYPE_EMBED to GTK_TYPE_CHAMPLAIN_EMBED to match Gtk's X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c105792068c1424b43e13574628a5467ce7774c2;p=libchamplain Rename GTK_CHAMPLAIN_TYPE_EMBED to GTK_TYPE_CHAMPLAIN_EMBED to match Gtk's --- diff --git a/champlain-gtk/gtk-champlain-embed.c b/champlain-gtk/gtk-champlain-embed.c index fea26c1..b70d44e 100644 --- a/champlain-gtk/gtk-champlain-embed.c +++ b/champlain-gtk/gtk-champlain-embed.c @@ -49,7 +49,7 @@ enum //static guint gtk_champlain_embed_embed_signals[LAST_SIGNAL] = { 0, }; -#define GTK_CHAMPLAIN_EMBED_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), GTK_CHAMPLAIN_TYPE_EMBED, GtkChamplainEmbedPrivate)) +#define GTK_CHAMPLAIN_EMBED_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), GTK_TYPE_CHAMPLAIN_EMBED, GtkChamplainEmbedPrivate)) struct _GtkChamplainEmbedPrivate { @@ -263,7 +263,7 @@ mouse_button_cb (GtkWidget *widget, GtkWidget * gtk_champlain_embed_new () { - return g_object_new (GTK_CHAMPLAIN_TYPE_EMBED, NULL); + return g_object_new (GTK_TYPE_CHAMPLAIN_EMBED, NULL); } /** diff --git a/champlain-gtk/gtk-champlain-embed.h b/champlain-gtk/gtk-champlain-embed.h index 4f719d2..eb1603e 100644 --- a/champlain-gtk/gtk-champlain-embed.h +++ b/champlain-gtk/gtk-champlain-embed.h @@ -26,12 +26,12 @@ #include #include -#define GTK_CHAMPLAIN_TYPE_EMBED (gtk_champlain_embed_get_type()) -#define GTK_CHAMPLAIN_EMBED(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_CHAMPLAIN_TYPE_EMBED, GtkChamplainEmbed)) -#define GTK_CHAMPLAIN_EMBED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_CHAMPLAIN_TYPE_EMBED, GtkChamplainEmbedClass)) -#define GTK_CHAMPLAIN_IS_EMBED(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_CHAMPLAIN_TYPE_EMBED)) -#define GTK_CHAMPLAIN_IS_EMBED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_CHAMPLAIN_TYPE_EMBED)) -#define GTK_CHAMPLAIN_EMBED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_CHAMPLAIN_TYPE_EMBED, GtkChamplainEmbedClass)) +#define GTK_TYPE_CHAMPLAIN_EMBED (gtk_champlain_embed_get_type()) +#define GTK_CHAMPLAIN_EMBED(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_CHAMPLAIN_EMBED, GtkChamplainEmbed)) +#define GTK_CHAMPLAIN_EMBED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_CHAMPLAIN_EMBED, GtkChamplainEmbedClass)) +#define GTK_CHAMPLAIN_IS_EMBED(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_CHAMPLAIN_EMBED)) +#define GTK_CHAMPLAIN_IS_EMBED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_CHAMPLAIN_EMBED)) +#define GTK_CHAMPLAIN_EMBED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_CHAMPLAIN_EMBED, GtkChamplainEmbedClass)) typedef struct _GtkChamplainEmbedPrivate GtkChamplainEmbedPrivate;