Mercurial > hg > xemacs-beta

diff src/gtk-glue.c @ 2054:91d4c8c65a0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2004-05-02 04:06:51 by malcolmp] Fix warnings and errors when building GTK using C++ and --use-union-type.
author malcolmp
date Sun, 02 May 2004 04:07:01 +0000
parents e22b0213b713
children 3d8143fc88e1
line wrap: on
line diff
--- a/src/gtk-glue.c	Sat May 01 21:50:40 2004 +0000
+++ b/src/gtk-glue.c	Sun May 02 04:07:01 2004 +0000
@@ -122,11 +122,11 @@
     {
       if (arg->type == GTK_TYPE_STRING_LIST)
 	{
-	  g_list_foreach (GTK_VALUE_POINTER (*arg), __make_string_mapper, &rval);
+	  g_list_foreach ((GList*) GTK_VALUE_POINTER (*arg), __make_string_mapper, &rval);
 	}
       else if (arg->type == GTK_TYPE_OBJECT_LIST)
 	{
-	  g_list_foreach (GTK_VALUE_POINTER (*arg), __make_gtk_object_mapper, &rval);
+	  g_list_foreach ((GList*) GTK_VALUE_POINTER (*arg), __make_gtk_object_mapper, &rval);
 	}
       else
 	{
@@ -169,7 +169,7 @@
   
   if (arg->type == GTK_TYPE_STRING_ARRAY)
     {
-      FROB(gchar *, CHECK_STRING, XSTRING_DATA);
+      FROB(gchar *, CHECK_STRING, (gchar*) XSTRING_DATA);
     }
   else if (arg->type == GTK_TYPE_FLOAT_ARRAY)
     {
@@ -249,8 +249,8 @@
 	      set_event_type (emacs_event, misc_user_event);
 	      SET_EVENT_MISC_USER_BUTTON (emacs_event, ev->button.button);
 	      SET_EVENT_MISC_USER_MODIFIERS (emacs_event, 0);
-	      SET_EVENT_MISC_USER_X (emacs_event, ev->button.x);
-	      SET_EVENT_MISC_USER_Y (emacs_event, ev->button.y);
+	      SET_EVENT_MISC_USER_X (emacs_event, (int) ev->button.x);
+	      SET_EVENT_MISC_USER_Y (emacs_event, (int) ev->button.y);
 	      if (ev->type == GDK_2BUTTON_PRESS)
 		SET_EVENT_MISC_USER_FUNCTION (emacs_event, intern ("double-click"));
 	      else