Mercurial > hg > xemacs-beta

comparison 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
comparison
equal deleted inserted replaced
2053:11e709117623 2054:91d4c8c65a0f
120 120
121 if (GTK_VALUE_POINTER (*arg)) 121 if (GTK_VALUE_POINTER (*arg))
122 { 122 {
123 if (arg->type == GTK_TYPE_STRING_LIST) 123 if (arg->type == GTK_TYPE_STRING_LIST)
124 { 124 {
125 g_list_foreach (GTK_VALUE_POINTER (*arg), __make_string_mapper, &rval); 125 g_list_foreach ((GList*) GTK_VALUE_POINTER (*arg), __make_string_mapper, &rval);
126 } 126 }
127 else if (arg->type == GTK_TYPE_OBJECT_LIST) 127 else if (arg->type == GTK_TYPE_OBJECT_LIST)
128 { 128 {
129 g_list_foreach (GTK_VALUE_POINTER (*arg), __make_gtk_object_mapper, &rval); 129 g_list_foreach ((GList*) GTK_VALUE_POINTER (*arg), __make_gtk_object_mapper, &rval);
130 } 130 }
131 else 131 else
132 { 132 {
133 abort(); 133 abort();
134 } 134 }
167 GTK_VALUE_POINTER(*arg) = array; \ 167 GTK_VALUE_POINTER(*arg) = array; \
168 } while (0); 168 } while (0);
169 169
170 if (arg->type == GTK_TYPE_STRING_ARRAY) 170 if (arg->type == GTK_TYPE_STRING_ARRAY)
171 { 171 {
172 FROB(gchar *, CHECK_STRING, XSTRING_DATA); 172 FROB(gchar *, CHECK_STRING, (gchar*) XSTRING_DATA);
173 } 173 }
174 else if (arg->type == GTK_TYPE_FLOAT_ARRAY) 174 else if (arg->type == GTK_TYPE_FLOAT_ARRAY)
175 { 175 {
176 FROB(gfloat, CHECK_FLOAT, extract_float); 176 FROB(gfloat, CHECK_FLOAT, extract_float);
177 } 177 }
247 if ((ev->type == GDK_2BUTTON_PRESS) || (ev->type == GDK_3BUTTON_PRESS)) 247 if ((ev->type == GDK_2BUTTON_PRESS) || (ev->type == GDK_3BUTTON_PRESS))
248 { 248 {
249 set_event_type (emacs_event, misc_user_event); 249 set_event_type (emacs_event, misc_user_event);
250 SET_EVENT_MISC_USER_BUTTON (emacs_event, ev->button.button); 250 SET_EVENT_MISC_USER_BUTTON (emacs_event, ev->button.button);
251 SET_EVENT_MISC_USER_MODIFIERS (emacs_event, 0); 251 SET_EVENT_MISC_USER_MODIFIERS (emacs_event, 0);
252 SET_EVENT_MISC_USER_X (emacs_event, ev->button.x); 252 SET_EVENT_MISC_USER_X (emacs_event, (int) ev->button.x);
253 SET_EVENT_MISC_USER_Y (emacs_event, ev->button.y); 253 SET_EVENT_MISC_USER_Y (emacs_event, (int) ev->button.y);
254 if (ev->type == GDK_2BUTTON_PRESS) 254 if (ev->type == GDK_2BUTTON_PRESS)
255 SET_EVENT_MISC_USER_FUNCTION (emacs_event, intern ("double-click")); 255 SET_EVENT_MISC_USER_FUNCTION (emacs_event, intern ("double-click"));
256 else 256 else
257 SET_EVENT_MISC_USER_FUNCTION (emacs_event, intern ("triple-click")); 257 SET_EVENT_MISC_USER_FUNCTION (emacs_event, intern ("triple-click"));
258 } 258 }