Complete.Org: Mailing Lists: Archives: freeciv-dev: March 2004:
[Freeciv-Dev] (PR#7913) remove pixmap_put_black_tile
Home

[Freeciv-Dev] (PR#7913) remove pixmap_put_black_tile

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: undisclosed-recipients: ;
Subject: [Freeciv-Dev] (PR#7913) remove pixmap_put_black_tile
From: "Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>
Date: Sat, 13 Mar 2004 14:01:18 -0800
Reply-to: rt@xxxxxxxxxxx

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

pixmap_put_black_tile is now unused in gtk, gtk2, xaw clients.  This 
patch removes it.

Tested under gtk2 only.

jason

Index: client/gui-gtk/mapview.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/mapview.c,v
retrieving revision 1.207
diff -u -r1.207 mapview.c
--- client/gui-gtk/mapview.c    13 Mar 2004 19:07:29 -0000      1.207
+++ client/gui-gtk/mapview.c    13 Mar 2004 22:00:25 -0000
@@ -395,18 +395,6 @@
 }
 
 /**************************************************************************
-...
-**************************************************************************/
-void pixmap_put_black_tile(GdkDrawable *pm,
-                          int canvas_x, int canvas_y)
-{
-  gdk_gc_set_foreground( fill_bg_gc, colors_standard[COLOR_STD_BLACK] );
-  gdk_draw_rectangle(pm, fill_bg_gc, TRUE,
-                    canvas_x, canvas_y,
-                    NORMAL_TILE_WIDTH, NORMAL_TILE_HEIGHT);
-}
-
-/**************************************************************************
 Only used for isometric view.
 **************************************************************************/
 void put_one_tile_full(GdkDrawable *pm, int x, int y,
Index: client/gui-gtk/mapview.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/mapview.h,v
retrieving revision 1.25
diff -u -r1.25 mapview.h
--- client/gui-gtk/mapview.h    27 Feb 2004 16:30:32 -0000      1.25
+++ client/gui-gtk/mapview.h    13 Mar 2004 22:00:25 -0000
@@ -35,8 +35,6 @@
 void put_unit_gpixmap_city_overlays(struct unit *punit, GtkPixcomm *p);
 void put_one_tile_full(GdkDrawable *pm, int x, int y,
                       int canvas_x, int canvas_y, int citymode);
-void pixmap_put_black_tile(GdkDrawable *pm,
-                          int canvas_x, int canvas_y);
 
 void pixmap_put_sprite_full(GdkDrawable *pixmap,
                            int pixmap_x, int pixmap_y,
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.106
diff -u -r1.106 mapview.c
--- client/gui-gtk-2.0/mapview.c        13 Mar 2004 19:07:29 -0000      1.106
+++ client/gui-gtk-2.0/mapview.c        13 Mar 2004 22:00:25 -0000
@@ -461,18 +461,6 @@
 }
 
 /**************************************************************************
-...
-**************************************************************************/
-void pixmap_put_black_tile(GdkDrawable *pm,
-                          int canvas_x, int canvas_y)
-{
-  gdk_gc_set_foreground( fill_bg_gc, colors_standard[COLOR_STD_BLACK] );
-  gdk_draw_rectangle(pm, fill_bg_gc, TRUE,
-                    canvas_x, canvas_y,
-                    NORMAL_TILE_WIDTH, NORMAL_TILE_HEIGHT);
-}
-
-/**************************************************************************
 Only used for isometric view.
 **************************************************************************/
 void put_one_tile_full(GdkDrawable *pm, int x, int y,
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.15
diff -u -r1.15 mapview.h
--- client/gui-gtk-2.0/mapview.h        27 Feb 2004 16:30:32 -0000      1.15
+++ client/gui-gtk-2.0/mapview.h        13 Mar 2004 22:00:25 -0000
@@ -38,8 +38,6 @@
 void put_unit_gpixmap_city_overlays(struct unit *punit, GtkPixcomm *p);
 void put_one_tile_full(GdkDrawable *pm, int x, int y,
                       int canvas_x, int canvas_y, int citymode);
-void pixmap_put_black_tile(GdkDrawable *pm,
-                          int canvas_x, int canvas_y);
 
 void pixmap_put_sprite_full(GdkDrawable *pixmap,
                            int pixmap_x, int pixmap_y,
Index: client/gui-xaw/mapview.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/mapview.c,v
retrieving revision 1.169
diff -u -r1.169 mapview.c
--- client/gui-xaw/mapview.c    13 Mar 2004 19:07:30 -0000      1.169
+++ client/gui-xaw/mapview.c    13 Mar 2004 22:00:25 -0000
@@ -716,18 +716,6 @@
 /**************************************************************************
 ...
 **************************************************************************/
-void pixmap_put_black_tile(Pixmap pm, int canvas_x, int canvas_y)
-{
-  XSetForeground(display, fill_bg_gc, colors_standard[COLOR_STD_BLACK]);
-
-  XFillRectangle(display, pm, fill_bg_gc,  
-                canvas_x, canvas_y,
-                NORMAL_TILE_WIDTH, NORMAL_TILE_HEIGHT);
-}
-                    
-/**************************************************************************
-...
-**************************************************************************/
 static void pixmap_put_overlay_tile(Pixmap pixmap, int canvas_x, int canvas_y,
                                    struct Sprite *ssprite)
 {
Index: client/gui-xaw/mapview.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/mapview.h,v
retrieving revision 1.22
diff -u -r1.22 mapview.h
--- client/gui-xaw/mapview.h    27 Feb 2004 16:30:33 -0000      1.22
+++ client/gui-xaw/mapview.h    13 Mar 2004 22:00:25 -0000
@@ -35,8 +35,6 @@
 void map_canvas_expose(Widget w, XEvent *event, Region exposed, 
                       void *client_data);
 
-void pixmap_put_black_tile(Pixmap pm, int canvas_x, int canvas_y);
-
 void scrollbar_jump_callback(Widget scrollbar, XtPointer client_data,
                             XtPointer percent_ptr);
 void scrollbar_scroll_callback(Widget w, XtPointer client_data,

[Prev in Thread] Current Thread [Next in Thread]
  • [Freeciv-Dev] (PR#7913) remove pixmap_put_black_tile, Jason Short <=