[Freeciv-Dev] (PR#12523) runtime fixes for gui-xaw

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=12523 >

This patch allows the XAW client to run, sort of.  Note the FIXME 
comment.  I will commit immediately.

-jason

Index: client/gui-xaw/graphics.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/graphics.c,v
retrieving revision 1.58
diff -u -r1.58 graphics.c
--- client/gui-xaw/graphics.c   14 Mar 2005 20:26:25 -0000      1.58
+++ client/gui-xaw/graphics.c   16 Mar 2005 05:24:55 -0000
@@ -235,8 +235,11 @@
   for (cursor = 0; cursor < CURSOR_LAST; cursor++) {
     sprite = get_cursor_sprite(cursor, &hot_x, &hot_y);
 
+    /* FIXME: this is entirely wrong.  It should be rewritten using
+     * XcursorImageLoadCursor.  See gdkcursor-x11.c in the GTK sources for
+     * examples. */
     cursors[cursor] = XCreatePixmapCursor(display,
-                                         sprite->pixmap, sprite->mask,
+                                         sprite->mask, sprite->mask,
                                          &white, &black, hot_x, hot_y);
   }
 }
Index: client/gui-xaw/mapview.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/mapview.c,v
retrieving revision 1.195
diff -u -r1.195 mapview.c
--- client/gui-xaw/mapview.c    13 Mar 2005 17:11:53 -0000      1.195
+++ client/gui-xaw/mapview.c    16 Mar 2005 05:24:55 -0000
@@ -691,7 +691,7 @@
                     enum client_font font, enum color_std color,
                     const char *text)
 {
-  draw_shadowed_string(pcanvas, (XFontSet)fonts[font], (GC)font_gcs[font],
+  draw_shadowed_string(pcanvas, *fonts[font], *font_gcs[font],
                       color, COLOR_STD_BLACK,
                       canvas_x, canvas_y, text);
 }