vte r2067 - in trunk: . src

[chpe svn gnome org]

Author: chpe
Date: Thu Jun 26 17:56:54 2008
New Revision: 2067
URL: http://svn.gnome.org/viewvc/vte?rev=2067&view=rev

Log:
Replace more gtk type macros with the gobject ones. Bug #539130.

Modified:
   trunk/ChangeLog
   trunk/src/reaper.h
   trunk/src/vte.c
   trunk/src/vteaccess.h
   trunk/src/vtebg.h

Modified: trunk/src/reaper.h
==============================================================================
--- trunk/src/reaper.h	(original)
+++ trunk/src/reaper.h	Thu Jun 26 17:56:54 2008
@@ -43,14 +43,14 @@
 GType vte_reaper_get_type(void);
 
 #define VTE_TYPE_REAPER			(vte_reaper_get_type())
-#define VTE_REAPER(obj)			(GTK_CHECK_CAST((obj), \
+#define VTE_REAPER(obj)			(G_TYPE_CHECK_INSTANCE_CAST((obj), \
 							VTE_TYPE_REAPER, \
 							VteReaper))
-#define VTE_REAPER_CLASS(klass)		GTK_CHECK_CLASS_CAST((klass), \
+#define VTE_REAPER_CLASS(klass)		G_TYPE_CHECK_CLASS_CAST((klass), \
 							     VTE_TYPE_REAPER, \
 							     VteReaperClass)
-#define VTE_IS_REAPER(obj)		GTK_CHECK_TYPE((obj), VTE_TYPE_REAPER)
-#define VTE_IS_REAPER_CLASS(klass)	GTK_CHECK_CLASS_TYPE((klass), \
+#define VTE_IS_REAPER(obj)		G_TYPE_CHECK_INSTANCE_TYPE((obj), VTE_TYPE_REAPER)
+#define VTE_IS_REAPER_CLASS(klass)	G_TYPE_CHECK_CLASS_TYPE((klass), \
 							     VTE_TYPE_REAPER)
 #define VTE_REAPER_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), \
 								   VTE_TYPE_REAPER, \

Modified: trunk/src/vte.c
==============================================================================
--- trunk/src/vte.c	(original)
+++ trunk/src/vte.c	Thu Jun 26 17:56:54 2008
@@ -11170,10 +11170,10 @@
 	process_timer = g_timer_new ();
 }
 
-GtkType
+GType
 vte_terminal_erase_binding_get_type(void)
 {
-	static GtkType terminal_erase_binding_type = 0;
+	static GType terminal_erase_binding_type = 0;
 	static GEnumValue values[] = {
 		{VTE_ERASE_AUTO, "VTE_ERASE_AUTO", "auto"},
 		{VTE_ERASE_ASCII_BACKSPACE, "VTE_ERASE_ASCII_BACKSPACE",
@@ -11191,10 +11191,10 @@
 	return terminal_erase_binding_type;
 }
 
-GtkType
+GType
 vte_terminal_anti_alias_get_type(void)
 {
-	static GtkType terminal_anti_alias_type = 0;
+	static GType terminal_anti_alias_type = 0;
 	static GEnumValue values[] = {
 		{VTE_ANTI_ALIAS_USE_DEFAULT, "VTE_ANTI_ALIAS_USE_DEFAULT", "use-default"},
 		{VTE_ANTI_ALIAS_FORCE_ENABLE, "VTE_ANTI_ALIAS_FORCE_ENABLE", "force-enable"},

Modified: trunk/src/vteaccess.h
==============================================================================
--- trunk/src/vteaccess.h	(original)
+++ trunk/src/vteaccess.h	Thu Jun 26 17:56:54 2008
@@ -48,20 +48,14 @@
 };
 
 /* The object's type. */
-GtkType vte_terminal_accessible_get_type(void);
+GType vte_terminal_accessible_get_type(void);
 
-#define VTE_TYPE_TERMINAL_ACCESSIBLE	(vte_terminal_accessible_get_type())
-#define VTE_TERMINAL_ACCESSIBLE(obj)	(GTK_CHECK_CAST((obj),\
-							VTE_TYPE_TERMINAL_ACCESSIBLE,\
-							VteTerminalAccessible))
-#define VTE_TERMINAL_ACCESSIBLE_CLASS(klass)	GTK_CHECK_CLASS_CAST((klass),\
-								     VTE_TYPE_TERMINAL_ACCESSIBLE,\
-								     VteTerminalAccessibleClass)
-#define VTE_IS_TERMINAL_ACCESSIBLE(obj)		GTK_CHECK_TYPE((obj),\
-							       VTE_TYPE_TERMINAL_ACCESSIBLE)
-#define VTE_IS_TERMINAL_ACCESSIBLE_CLASS(klass)	GTK_CHECK_CLASS_TYPE((klass),\
-								     VTE_TYPE_TERMINAL_ACCESSIBLE)
-#define VTE_TERMINAL_ACCESSIBLE_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), VTE_TYPE_TERMINAL_ACCESSIBLE, VteTerminalAccessibleClass))
+#define VTE_TYPE_TERMINAL_ACCESSIBLE              (vte_terminal_accessible_get_type ())
+#define VTE_TERMINAL_ACCESSIBLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), VTE_TYPE_TERMINAL_ACCESSIBLE, VteTerminalAccessible))
+#define VTE_TERMINAL_ACCESSIBLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), VTE_TYPE_TERMINAL_ACCESSIBLE, VteTerminalAccessibleClass))
+#define VTE_IS_TERMINAL_ACCESSIBLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), VTE_TYPE_TERMINAL_ACCESSIBLE))
+#define VTE_IS_TERMINAL_ACCESSIBLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), VTE_TYPE_TERMINAL_ACCESSIBLE))
+#define VTE_TERMINAL_ACCESSIBLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), VTE_TYPE_TERMINAL_ACCESSIBLE, VteTerminalAccessibleClass))
 
 AtkObject *vte_terminal_accessible_new(VteTerminal *terminal);
 
@@ -82,20 +76,14 @@
 };
 
 /* The object's factory's type. */
-GtkType vte_terminal_accessible_factory_get_type(void);
+GType vte_terminal_accessible_factory_get_type(void);
 
-#define VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY	(vte_terminal_accessible_factory_get_type())
-#define VTE_TERMINAL_ACCESSIBLE_FACTORY(obj)	(GTK_CHECK_CAST((obj),\
-								VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY,\
-								VteTerminalAccessibleFactory))
-#define VTE_TERMINAL_ACCESSIBLE_FACTORY_CLASS(klass)	GTK_CHECK_CLASS_CAST((klass),\
-									     VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY,\
-									     VteTerminalAccessibleFactoryClass)
-#define VTE_IS_TERMINAL_ACCESSIBLE_FACTORY(obj)		GTK_CHECK_TYPE((obj),\
-								       VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY)
-#define VTE_IS_TERMINAL_ACCESSIBLE_FACTORY_CLASS(klass)	GTK_CHECK_CLASS_TYPE((klass),\
-									     VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY)
-#define VTE_TERMINAL_ACCESSIBLE_FACTORY_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY, VteTerminalAccessibleFactoryClass))
+#define VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY              (vte_terminal_accessible_factory_get_type ())
+#define VTE_TERMINAL_ACCESSIBLE_FACTORY(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY, VteTerminalAccessibleFactory))
+#define VTE_TERMINAL_ACCESSIBLE_FACTORY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY, VteTerminalAccessibleFactoryClass))
+#define VTE_IS_TERMINAL_ACCESSIBLE_FACTORY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY))
+#define VTE_IS_TERMINAL_ACCESSIBLE_FACTORY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY))
+#define VTE_TERMINAL_ACCESSIBLE_FACTORY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY, VteTerminalAccessibleFactoryClass))
 
 AtkObjectFactory *vte_terminal_accessible_factory_new(void);
 

Modified: trunk/src/vtebg.h
==============================================================================
--- trunk/src/vtebg.h	(original)
+++ trunk/src/vtebg.h	Thu Jun 26 17:56:54 2008
@@ -42,10 +42,10 @@
 };
 
 #define VTE_TYPE_BG vte_bg_get_type()
-#define VTE_BG(obj)	       (GTK_CHECK_CAST((obj), VTE_TYPE_BG, VteBg))
-#define VTE_BG_CLASS(klass)    (GTK_CHECK_CLASS_CAST((klass), VTE_TYPE_BG, VteBgClass)
-#define VTE_IS_BG(obj)	       GTK_CHECK_TYPE((obj), VTE_TYPE_BG)
-#define VTE_IS_BG_CLASS(klass) GTK_CHECK_CLASS_TYPE((klass), VTE_TYPE_BG)
+#define VTE_BG(obj)	       (G_TYPE_CHECK_INSTANCE_CAST((obj), VTE_TYPE_BG, VteBg))
+#define VTE_BG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), VTE_TYPE_BG, VteBgClass)
+#define VTE_IS_BG(obj)	       G_TYPE_CHECK_INSTANCE_TYPE((obj), VTE_TYPE_BG)
+#define VTE_IS_BG_CLASS(klass) G_TYPE_CHECK_CLASS_TYPE((klass), VTE_TYPE_BG)
 #define VTE_BG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), VTE_TYPE_BG, VteBgClass))
 
 GType vte_bg_get_type(void);