[Freeciv-Dev] Re: (PR#8359) remove pixmap_put_sprite_full

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=8359 >

Jason Short wrote:

> This function is unused in gui-gtk-2.0 and nearly so in gui-gtk.  This 
> patch removes it.  It's easy enough to use canvas_put_sprite_full 
> instead if it is needed in future.


Index: client/gui-gtk/happiness.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/happiness.c,v
retrieving revision 1.13
diff -u -r1.13 happiness.c
--- client/gui-gtk/happiness.c  4 Apr 2003 15:47:46 -0000       1.13
+++ client/gui-gtk/happiness.c  24 Mar 2004 20:27:43 -0000
@@ -169,11 +169,12 @@
 
   GdkPixmap *happiness_pixmap = gdk_pixmap_new(root_window, true_pix_width,
                                               SMALL_TILE_HEIGHT, -1);
+  struct canvas canvas = {happiness_pixmap};
 
   get_city_citizen_types(pcity, index, citizens);
 
   for (i = 0; i < num_citizens; i++) {
-    pixmap_put_sprite_full(happiness_pixmap,
+    canvas_put_sprite_full(&canvas,
                           i * offset, 0,
                           get_citizen_sprite(citizens[i], i, pcity));
   }
Index: client/gui-gtk/mapview.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/mapview.c,v
retrieving revision 1.210
diff -u -r1.210 mapview.c
--- client/gui-gtk/mapview.c    24 Mar 2004 06:18:18 -0000      1.210
+++ client/gui-gtk/mapview.c    24 Mar 2004 20:27:43 -0000
@@ -686,17 +686,6 @@
 }
 
 /**************************************************************************
-  Place a (possibly masked) sprite on a pixmap.
-**************************************************************************/
-void pixmap_put_sprite_full(GdkDrawable *pixmap,
-                           int pixmap_x, int pixmap_y,
-                           struct Sprite *ssprite)
-{
-  pixmap_put_sprite(pixmap, pixmap_x, pixmap_y, ssprite,
-                   0, 0, ssprite->width, ssprite->height);
-}
-
-/**************************************************************************
   Draw a filled-in colored rectangle onto the mapview or citydialog canvas.
 **************************************************************************/
 void canvas_put_rectangle(struct canvas *pcanvas,
Index: client/gui-gtk/mapview.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/mapview.h,v
retrieving revision 1.26
diff -u -r1.26 mapview.h
--- client/gui-gtk/mapview.h    15 Mar 2004 05:35:28 -0000      1.26
+++ client/gui-gtk/mapview.h    24 Mar 2004 20:27:43 -0000
@@ -36,10 +36,6 @@
 void put_one_tile_full(GdkDrawable *pm, int x, int y,
                       int canvas_x, int canvas_y, int citymode);
 
-void pixmap_put_sprite_full(GdkDrawable *pixmap,
-                           int pixmap_x, int pixmap_y,
-                           struct Sprite *ssprite);
-
 void scrollbar_jump_callback(GtkAdjustment *adj, gpointer hscrollbar);
 void update_map_canvas_scrollbars_size(void);
 
Index: client/gui-gtk-2.0/mapview.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/mapview.c,v
retrieving revision 1.109
diff -u -r1.109 mapview.c
--- client/gui-gtk-2.0/mapview.c        24 Mar 2004 06:18:18 -0000      1.109
+++ client/gui-gtk-2.0/mapview.c        24 Mar 2004 20:27:43 -0000
@@ -756,17 +756,6 @@
 }
 
 /**************************************************************************
-  Place a (possibly masked) sprite on a pixmap.
-**************************************************************************/
-void pixmap_put_sprite_full(GdkDrawable *pixmap,
-                           int pixmap_x, int pixmap_y,
-                           struct Sprite *ssprite)
-{
-  pixmap_put_sprite(pixmap, pixmap_x, pixmap_y, ssprite,
-                   0, 0, ssprite->width, ssprite->height);
-}
-
-/**************************************************************************
   Draw a filled-in colored rectangle onto the mapview or citydialog canvas.
 **************************************************************************/
 void canvas_put_rectangle(struct canvas *pcanvas,
Index: client/gui-gtk-2.0/mapview.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/mapview.h,v
retrieving revision 1.16
diff -u -r1.16 mapview.h
--- client/gui-gtk-2.0/mapview.h        15 Mar 2004 05:35:28 -0000      1.16
+++ client/gui-gtk-2.0/mapview.h        24 Mar 2004 20:27:43 -0000
@@ -39,10 +39,6 @@
 void put_one_tile_full(GdkDrawable *pm, int x, int y,
                       int canvas_x, int canvas_y, int citymode);
 
-void pixmap_put_sprite_full(GdkDrawable *pixmap,
-                           int pixmap_x, int pixmap_y,
-                           struct Sprite *ssprite);
-
 void scrollbar_jump_callback(GtkAdjustment *adj, gpointer hscrollbar);
 void update_map_canvas_scrollbars_size(void);