Mercurial > hg > xemacs-beta
diff src/device-gtk.c @ 2054:91d4c8c65a0f
[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 |
line wrap: on
line diff
--- a/src/device-gtk.c Sat May 01 21:50:40 2004 +0000 +++ b/src/device-gtk.c Sun May 02 04:07:01 2004 +0000 @@ -236,7 +236,8 @@ new_rc_files = xnew_array_and_zero (gchar *, num_files + 3); - new_rc_files[0] = XSTRING_DATA (gtkrc); + LISP_STRING_TO_EXTERNAL (gtkrc, new_rc_files[0], Qfile_name); + for (ctr = 1; default_files[ctr-1]; ctr++) new_rc_files[ctr] = g_strdup (default_files[ctr-1]); @@ -553,13 +554,13 @@ w = GET_GTK_WIDGET_WINDOW (FRAME_GTK_TEXT_WIDGET (device_selected_frame (d))); result = gdk_pointer_grab (w, FALSE, - GDK_POINTER_MOTION_MASK | - GDK_POINTER_MOTION_HINT_MASK | - GDK_BUTTON1_MOTION_MASK | - GDK_BUTTON2_MOTION_MASK | - GDK_BUTTON3_MOTION_MASK | - GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK, + (GdkEventMask) (GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_HINT_MASK | + GDK_BUTTON1_MOTION_MASK | + GDK_BUTTON2_MOTION_MASK | + GDK_BUTTON3_MOTION_MASK | + GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK), w, NULL, /* #### BILL!!! Need to create a GdkCursor * as necessary! */ GDK_CURRENT_TIME);