GNOME.org
 

[rep-gtk] moved from GTK_TYPE_* to G_TYPE_*

commit cc920b4276a0b87553b8dd9c57d90f0dad9e0e36
Author: chrisb <zanghar freenet de>
Date:   Fri Jul 31 09:48:39 2009 +0200

    moved from GTK_TYPE_* to G_TYPE_*

 ChangeLog    |    5 ++
 config.guess |   58 +++++++--------------------
 config.h.in  |    3 +
 config.sub   |   15 +++++--
 gtk.defs     |   41 ++++++++++---------
 rep-gtk.c    |  126 +++++++++++++++++++++++++++++-----------------------------
 6 files changed, 118 insertions(+), 130 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d9c2149..f997059 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-31  Christopher Bratusek <zanghar freenet de>
+	* rep-gtk.c
+	* rep-gtk.h
+	* gtk.defs: moved from GTK_TYPE_* to G_TYPE_*
+
 2009-07-30  Christopher Bratusek <zanghar freenet de>
 	* rep-gtk.h
 	* gtk-compat.c
diff --git a/config.guess b/config.guess
index da83314..e3a2116 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-27'
+timestamp='2009-06-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -656,7 +656,7 @@ EOF
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -822,6 +822,9 @@ EOF
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -882,40 +885,17 @@ EOF
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips
-	#undef mipsel
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
@@ -947,7 +927,7 @@ EOF
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
@@ -1001,14 +981,6 @@ EOF
 	  elf32-i386)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -1074,7 +1046,7 @@ EOF
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1182,7 +1154,7 @@ EOF
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
diff --git a/config.h.in b/config.h.in
index 94f278e..1060efa 100644
--- a/config.h.in
+++ b/config.h.in
@@ -45,6 +45,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
diff --git a/config.sub b/config.sub
index a39437d..eb0389a 100755
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-17'
+timestamp='2009-06-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -153,6 +153,9 @@ case $os in
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -467,6 +470,10 @@ case $basic_machine in
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -1260,7 +1267,7 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
 	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
@@ -1613,7 +1620,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
diff --git a/gtk.defs b/gtk.defs
index cca4ba2..250456d 100644
--- a/gtk.defs
+++ b/gtk.defs
@@ -1,5 +1,10 @@
 ;; -*- lisp -*-
 
+;; updated for gtk+ 2.12:
+
+;; GtkButton, GtkToggleButton, GtkCheckButton, GtkRadioButton, GtkFontButton
+;; GtkLinkButton, GtkColorButton, GtkVolumeButton, GtkStatusIcon
+
 ;; updated for gtk+ 1.3:
 
 ;; GtkButton, GtkWidget, GtkContainer, GtkFixed, GtkWindow, GtkHandleBox,
@@ -365,26 +370,22 @@
 ;  (item GTK_TREE_VIEW_ITEM))
 
 (define-enum GtkFundamentalType
-  (invalid GTK_TYPE_INVALID)
-  (none GTK_TYPE_NONE)
-  (char GTK_TYPE_CHAR)
-  (bool GTK_TYPE_BOOL)
-  (int GTK_TYPE_INT)
-  (uint GTK_TYPE_UINT)
-  (long GTK_TYPE_LONG)
-  (ulong GTK_TYPE_ULONG)
-  (float GTK_TYPE_FLOAT)
-  (string GTK_TYPE_STRING)
-  (enum GTK_TYPE_ENUM)
-  (flags GTK_TYPE_FLAGS)
-  (boxed GTK_TYPE_BOXED)
-;  (foreign GTK_TYPE_FOREIGN)
-;  (callback GTK_TYPE_CALLBACK)
-;  (args GTK_TYPE_ARGS)
-  (pointer GTK_TYPE_POINTER)
-;  (signal GTK_TYPE_SIGNAL)
-;  (c-callback GTK_TYPE_C_CALLBACK)
-;  (object GTK_TYPE_OBJECT)
+  (invalid G_TYPE_INVALID)
+  (none G_TYPE_NONE)
+  (char G_TYPE_CHAR)
+  (uchar G_TYPE_UCHAR)
+  (bool G_TYPE_BOOLEAN)
+  (int G_TYPE_INT)
+  (uint G_TYPE_UINT)
+  (long G_TYPE_LONG)
+  (ulong G_TYPE_ULONG)
+  (float G_TYPE_FLOAT)
+  (double G_TYPE_DOUBLE)
+  (string G_TYPE_STRING)
+  (enum G_TYPE_ENUM)
+  (flags G_TYPE_FLAGS)
+  (boxed G_TYPE_BOXED)
+  (pointer G_TYPE_POINTER)
 )
 
 (define-enum GtkSpinButtonUpdatePolicy
diff --git a/rep-gtk.c b/rep-gtk.c
index 1fe8e76..0dabd0a 100644
--- a/rep-gtk.c
+++ b/rep-gtk.c
@@ -1443,49 +1443,49 @@ sgtk_font_conversion (repv font)
 repv
 sgtk_arg_to_rep (GtkArg *a, int free_mem)
 {
-  if (GTK_TYPE_IS_OBJECT (a->type))
+  if (G_TYPE_IS_OBJECT (a->type))
   {
     return sgtk_wrap_gtkobj (GTK_VALUE_OBJECT(*a));
   }
 
   switch (GTK_FUNDAMENTAL_TYPE (a->type))
     {
-    case GTK_TYPE_NONE:
+    case G_TYPE_NONE:
       return Qnil;
-    case GTK_TYPE_CHAR:
+    case G_TYPE_CHAR:
       return rep_MAKE_INT (GTK_VALUE_CHAR(*a));
-    case GTK_TYPE_BOOL:
+    case G_TYPE_BOOLEAN:
       return GTK_VALUE_BOOL(*a)? Qt : Qnil;
-    case GTK_TYPE_INT:
+    case G_TYPE_INT:
       return sgtk_int_to_rep (GTK_VALUE_INT(*a));
-    case GTK_TYPE_UINT:
+    case G_TYPE_UINT:
       return sgtk_uint_to_rep (GTK_VALUE_UINT(*a));
-    case GTK_TYPE_LONG:
+    case G_TYPE_LONG:
       return sgtk_int_to_rep (GTK_VALUE_LONG(*a));
-    case GTK_TYPE_ULONG:
+    case G_TYPE_ULONG:
       return sgtk_uint_to_rep (GTK_VALUE_ULONG(*a));
-    case GTK_TYPE_FLOAT:
+    case G_TYPE_FLOAT:
       return sgtk_float_to_rep (GTK_VALUE_FLOAT(*a));
-    case GTK_TYPE_DOUBLE:
+    case G_TYPE_DOUBLE:
       return sgtk_double_to_rep (GTK_VALUE_DOUBLE(*a));
-    case GTK_TYPE_STRING:
+    case G_TYPE_STRING:
       {
 	repv ret = rep_string_dup (GTK_VALUE_STRING(*a));
 	if (free_mem)
 	  g_free GTK_VALUE_STRING(*a);
 	return ret;
       }
-    case GTK_TYPE_ENUM:
+    case G_TYPE_ENUM:
       return sgtk_enum_to_rep (GTK_VALUE_FLAGS(*a),
 			       (sgtk_enum_info *)sgtk_find_type_info (a->type));
-    case GTK_TYPE_FLAGS:
+    case G_TYPE_FLAGS:
       return sgtk_flags_to_rep (GTK_VALUE_FLAGS(*a),
 				(sgtk_enum_info *)sgtk_find_type_info (a->type));
-    case GTK_TYPE_BOXED:
+    case G_TYPE_BOXED:
       return sgtk_boxed_to_rep (GTK_VALUE_BOXED(*a),
 				(sgtk_boxed_info *)sgtk_find_type_info (a->type),
 				TRUE);
-    case GTK_TYPE_POINTER:
+    case G_TYPE_POINTER:
       return sgtk_pointer_to_rep (GTK_VALUE_POINTER(*a));
     default:
       fprintf (stderr, "illegal type %s in arg\n",
@@ -1497,39 +1497,39 @@ sgtk_arg_to_rep (GtkArg *a, int free_mem)
 int
 sgtk_valid_arg_type (GType type, repv obj)
 {
-  if (GTK_TYPE_IS_OBJECT (type))
+  if (G_TYPE_IS_OBJECT (type))
   {
     return sgtk_is_a_gtkobj (type, obj);
   }
   switch (GTK_FUNDAMENTAL_TYPE (type))
     {
-    case GTK_TYPE_NONE:
+    case G_TYPE_NONE:
       return TRUE;
-    case GTK_TYPE_CHAR:
+    case G_TYPE_CHAR:
       return sgtk_valid_char(obj);
-    case GTK_TYPE_BOOL:
+    case G_TYPE_BOOLEAN:
       return TRUE;
-    case GTK_TYPE_INT:
-    case GTK_TYPE_UINT:
-    case GTK_TYPE_LONG:
-    case GTK_TYPE_ULONG:
+    case G_TYPE_INT:
+    case G_TYPE_UINT:
+    case G_TYPE_LONG:
+    case G_TYPE_ULONG:
       return sgtk_valid_int (obj);
-    case GTK_TYPE_FLOAT:
-    case GTK_TYPE_DOUBLE:
+    case G_TYPE_FLOAT:
+    case G_TYPE_DOUBLE:
       return sgtk_valid_float (obj);
-    case GTK_TYPE_STRING:
+    case G_TYPE_STRING:
       return rep_STRINGP (obj);
-    case GTK_TYPE_ENUM:
+    case G_TYPE_ENUM:
       return sgtk_valid_enum (obj, ((sgtk_enum_info *)
 				    sgtk_find_type_info (type)));
-    case GTK_TYPE_FLAGS:
+    case G_TYPE_FLAGS:
       return sgtk_valid_flags (obj, ((sgtk_enum_info *)
 				     sgtk_find_type_info (type)));
-    case GTK_TYPE_BOXED:
+    case G_TYPE_BOXED:
       return sgtk_valid_boxed (obj, ((sgtk_boxed_info *)
 				     sgtk_find_type_info (type)));
       break;
-    case GTK_TYPE_POINTER:
+    case G_TYPE_POINTER:
       return BOXED_P (obj) || GOBJP (obj) || sgtk_valid_pointer (obj);
       break;
     default:
@@ -1541,54 +1541,54 @@ sgtk_valid_arg_type (GType type, repv obj)
 void
 sgtk_rep_to_arg (GtkArg *a, repv obj, repv protector)
 {
-  if (GTK_TYPE_IS_OBJECT (a->type))
+  if (G_TYPE_IS_OBJECT (a->type))
   {
     GTK_VALUE_OBJECT(*a) = sgtk_get_gtkobj (obj);
     return;
   }
   switch (GTK_FUNDAMENTAL_TYPE (a->type))
     {
-    case GTK_TYPE_NONE:
+    case G_TYPE_NONE:
       return;
-    case GTK_TYPE_CHAR:
+    case G_TYPE_CHAR:
       GTK_VALUE_CHAR(*a) = rep_INT (obj);
       break;
-    case GTK_TYPE_BOOL:
+    case G_TYPE_BOOLEAN:
       GTK_VALUE_BOOL(*a) = obj != Qnil;
       break;
-    case GTK_TYPE_INT:
+    case G_TYPE_INT:
       GTK_VALUE_INT(*a) = sgtk_rep_to_int (obj);
       break;
-    case GTK_TYPE_UINT:
+    case G_TYPE_UINT:
       GTK_VALUE_UINT(*a) = sgtk_rep_to_uint (obj);
       break;
-    case GTK_TYPE_LONG:
+    case G_TYPE_LONG:
       GTK_VALUE_LONG(*a) = sgtk_rep_to_long (obj);
       break;
-    case GTK_TYPE_ULONG:
+    case G_TYPE_ULONG:
       GTK_VALUE_ULONG(*a) = sgtk_rep_to_ulong (obj);
       break;
-    case GTK_TYPE_FLOAT:
+    case G_TYPE_FLOAT:
       GTK_VALUE_FLOAT(*a) = sgtk_rep_to_float (obj);
       break;
-    case GTK_TYPE_DOUBLE:
+    case G_TYPE_DOUBLE:
       GTK_VALUE_DOUBLE(*a) = sgtk_rep_to_double (obj);
       break;
-    case GTK_TYPE_STRING:
+    case G_TYPE_STRING:
       GTK_VALUE_STRING(*a) = sgtk_rep_to_string (obj);
       break;
-    case GTK_TYPE_ENUM:
+    case G_TYPE_ENUM:
       GTK_VALUE_ENUM(*a) =
 	sgtk_rep_to_enum (obj, (sgtk_enum_info *)sgtk_find_type_info (a->type));
       break;
-    case GTK_TYPE_FLAGS:
+    case G_TYPE_FLAGS:
       GTK_VALUE_ENUM(*a) =
 	sgtk_rep_to_flags (obj, (sgtk_enum_info *)sgtk_find_type_info (a->type));
       break;
-    case GTK_TYPE_BOXED:
+    case G_TYPE_BOXED:
       GTK_VALUE_BOXED(*a) = sgtk_rep_to_boxed (obj);
       break;
-    case GTK_TYPE_POINTER:
+    case G_TYPE_POINTER:
       if (BOXED_P (obj))
 	  GTK_VALUE_POINTER(*a) = BOXED_PTR (obj);
       else if (GOBJP (obj))
@@ -1605,7 +1605,7 @@ sgtk_rep_to_arg (GtkArg *a, repv obj, repv protector)
 void
 sgtk_rep_to_ret (GtkArg *a, repv obj)
 {
-  if (GTK_TYPE_IS_OBJECT (a->type))
+  if (G_TYPE_IS_OBJECT (a->type))
   {
     if (sgtk_is_a_gtkobj (a->type, obj))
       *GTK_RETLOC_OBJECT(*a) = sgtk_get_gtkobj (obj);
@@ -1615,44 +1615,44 @@ sgtk_rep_to_ret (GtkArg *a, repv obj)
   }
   switch (GTK_FUNDAMENTAL_TYPE (a->type))
     {
-    case GTK_TYPE_NONE:
+    case G_TYPE_NONE:
       return;
-    case GTK_TYPE_CHAR:
+    case G_TYPE_CHAR:
       *GTK_RETLOC_CHAR(*a) = rep_INT (obj);
       break;
-    case GTK_TYPE_BOOL:
+    case G_TYPE_BOOLEAN:
       *GTK_RETLOC_BOOL(*a) = (obj != Qnil);
       break;
-    case GTK_TYPE_INT:
+    case G_TYPE_INT:
       *GTK_RETLOC_INT(*a) = sgtk_rep_to_int (obj);
       break;
-    case GTK_TYPE_UINT:
+    case G_TYPE_UINT:
       *GTK_RETLOC_UINT(*a) = sgtk_rep_to_uint (obj);
       break;
-    case GTK_TYPE_LONG:
+    case G_TYPE_LONG:
       *GTK_RETLOC_LONG(*a) = sgtk_rep_to_long (obj);
       break;
-    case GTK_TYPE_ULONG:
+    case G_TYPE_ULONG:
       *GTK_RETLOC_ULONG(*a) = sgtk_rep_to_ulong (obj);
       break;
-    case GTK_TYPE_FLOAT:
+    case G_TYPE_FLOAT:
       *GTK_RETLOC_FLOAT(*a) = sgtk_rep_to_float (obj);
       break;
-    case GTK_TYPE_DOUBLE:
+    case G_TYPE_DOUBLE:
       *GTK_RETLOC_DOUBLE(*a) = sgtk_rep_to_double (obj);
       break;
-    case GTK_TYPE_STRING:
+    case G_TYPE_STRING:
       GTK_VALUE_STRING(*a) = g_strdup (rep_STR(obj));
       break;
-    case GTK_TYPE_ENUM:
+    case G_TYPE_ENUM:
       *GTK_RETLOC_ENUM(*a) =
 	sgtk_rep_to_enum (obj, (sgtk_enum_info *)sgtk_find_type_info (a->type));
       break;
-    case GTK_TYPE_FLAGS:
+    case G_TYPE_FLAGS:
       *GTK_RETLOC_ENUM(*a) =
 	sgtk_rep_to_flags (obj, (sgtk_enum_info *)sgtk_find_type_info (a->type));
       break;
-    case GTK_TYPE_BOXED:
+    case G_TYPE_BOXED:
       *GTK_RETLOC_BOXED(*a) = sgtk_rep_to_boxed (obj);
       break;
     default:
@@ -1688,7 +1688,7 @@ inner_callback_marshal (repv data)
     ans = rep_apply (rep_CAR(callback_trampoline),
 		       Fcons (info->proc, Fcons (args, Qnil)));
 
-  if (info->args[info->n_args].type != GTK_TYPE_NONE)
+  if (info->args[info->n_args].type != G_TYPE_NONE)
     sgtk_rep_to_ret (info->args+info->n_args, ans);
 
   return Qnil;
@@ -2017,7 +2017,7 @@ gtk_class_new (GtkType parent_type, gchar *name)
   GtkTypeInfo parent_info;
 
   if (!gtk_type_get_info (parent_type, &parent_info))
-    return GTK_TYPE_INVALID;
+    return G_TYPE_INVALID;
 
   info.type_name = name;
   info.object_size = parent_info.object_size;
@@ -2039,7 +2039,7 @@ gtk_signal_new_generic (const gchar     *name,
 {
   guint signal_id;
 
-  if (!GTK_TYPE_IS_OBJECT (type))
+  if (!G_TYPE_IS_OBJECT (type))
     return 0;
 
   signal_id = gtk_signal_newv (name, signal_flags, type,
@@ -2093,7 +2093,7 @@ sgtk_signal_emit (GtkObject *obj, char *name, repv scm_args)
       i++;
       scm_args = rep_CDR (scm_args);
     }
-  args[i].type = GTK_TYPE_NONE;
+  args[i].type = G_TYPE_NONE;
 
   gtk_signal_emitv (obj, signal_id, args);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]