Mercurial > hg > xemacs-beta

comparison src/device-gtk.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 a8d8f419b459
children 04bc9d2f42c7
comparison
equal deleted inserted replaced
2053:11e709117623 2054:91d4c8c65a0f
234 234
235 for (num_files = 0; default_files[num_files]; num_files++); 235 for (num_files = 0; default_files[num_files]; num_files++);
236 236
237 new_rc_files = xnew_array_and_zero (gchar *, num_files + 3); 237 new_rc_files = xnew_array_and_zero (gchar *, num_files + 3);
238 238
239 new_rc_files[0] = XSTRING_DATA (gtkrc); 239 LISP_STRING_TO_EXTERNAL (gtkrc, new_rc_files[0], Qfile_name);
240
240 for (ctr = 1; default_files[ctr-1]; ctr++) 241 for (ctr = 1; default_files[ctr-1]; ctr++)
241 new_rc_files[ctr] = g_strdup (default_files[ctr-1]); 242 new_rc_files[ctr] = g_strdup (default_files[ctr-1]);
242 243
243 gtk_rc_set_default_files (new_rc_files); 244 gtk_rc_set_default_files (new_rc_files);
244 245
551 552
552 /* We should call gdk_pointer_grab() and (possibly) gdk_keyboard_grab() here instead */ 553 /* We should call gdk_pointer_grab() and (possibly) gdk_keyboard_grab() here instead */
553 w = GET_GTK_WIDGET_WINDOW (FRAME_GTK_TEXT_WIDGET (device_selected_frame (d))); 554 w = GET_GTK_WIDGET_WINDOW (FRAME_GTK_TEXT_WIDGET (device_selected_frame (d)));
554 555
555 result = gdk_pointer_grab (w, FALSE, 556 result = gdk_pointer_grab (w, FALSE,
556 GDK_POINTER_MOTION_MASK | 557 (GdkEventMask) (GDK_POINTER_MOTION_MASK |
557 GDK_POINTER_MOTION_HINT_MASK | 558 GDK_POINTER_MOTION_HINT_MASK |
558 GDK_BUTTON1_MOTION_MASK | 559 GDK_BUTTON1_MOTION_MASK |
559 GDK_BUTTON2_MOTION_MASK | 560 GDK_BUTTON2_MOTION_MASK |
560 GDK_BUTTON3_MOTION_MASK | 561 GDK_BUTTON3_MOTION_MASK |
561 GDK_BUTTON_PRESS_MASK | 562 GDK_BUTTON_PRESS_MASK |
562 GDK_BUTTON_RELEASE_MASK, 563 GDK_BUTTON_RELEASE_MASK),
563 w, 564 w,
564 NULL, /* #### BILL!!! Need to create a GdkCursor * as necessary! */ 565 NULL, /* #### BILL!!! Need to create a GdkCursor * as necessary! */
565 GDK_CURRENT_TIME); 566 GDK_CURRENT_TIME);
566 567
567 return (result == 0) ? Qt : Qnil; 568 return (result == 0) ? Qt : Qnil;