Firstly a couple of questions about the coding standard,
1. The coding standard specfies that tabs are not to be used, however
tabs are used throughout the source code. Why is this?
2. I have tried using 'indent' to indent the code according to the
coding standards, however this does not produce satisfactory results. (i
have tried various options including the standard GNU style)
What's the best way to make the code comply with the coding standards?
Here is a patch which replaces some depreciated GDK functions,
Okay to commit?,
thanks,
Thomas
Index: gimp/ChangeLog
===================================================================
RCS file: /cvs/gnome/gimp/ChangeLog,v
retrieving revision 1.3738
diff -u -r1.3738 ChangeLog
--- gimp/ChangeLog 2001/08/30 01:09:54 1.3738
+++ gimp/ChangeLog 2001/08/31 04:11:31
@@ -1,3 +1,32 @@
+2001-08-31 Thomas Canty <tommydal@xxxxxxxxxxxxxxxx>
+ * app/colormaps.c
+ * app/gdisplay.c
+ * app/nav_window.c
+ * app/scroll.c
+ * app/selection.c
+ * app/undo.c
+ * app/gui/about-dialog.c
+ * app/gui/color-area.c
+ * app/gui/color-select.c
+ * app/gui/gradient-editor.c
+ * app/gui/gui.c
+ * app/gui/splash.c
+ * app/tools/gimpcurvestool.c
+ * plug-ins/Lighting/lighting_preview.c
+ * plug-ins/Lighting/lighting_ui.c
+ * plug-ins/MapObject/mapobject_preview.c
+ * plug-ins/MapObject/mapobject_ui.c
+ * plug-ins/common/animationplay.c
+ * plug-ins/common/curve_bend.c
+ * plug-ins/gap/gap_navigator_dialog.c
+ * plug-ins/gfig/gfig.c
+ * plug-ins/gimpressionist/gimpressionist.c
+ * plug-ins/ifscompose/ifscompose.c
+ * plug-ins/imagemap/imap_main.c
+ * plug-ins/imagemap/imap_preferences.c
+ * plug-ins/imagemap/imap_preview.c: replaced some deprecated GDK
+ functions
+
2001-08-30 Michael Natterer <mitch@xxxxxxxx>
* app/plug_in.c
Index: gimp/app/colormaps.c
===================================================================
RCS file: /cvs/gnome/gimp/app/colormaps.c,v
retrieving revision 1.21
diff -u -r1.21 colormaps.c
--- gimp/app/colormaps.c 2001/07/24 21:26:46 1.21
+++ gimp/app/colormaps.c 2001/08/31 04:11:33
@@ -72,7 +72,7 @@
gdk_rgb_set_install (gimprc.install_cmap);
g_visual = gdk_rgb_get_visual ();
- g_cmap = gdk_rgb_get_cmap ();
+ g_cmap = gdk_rgb_get_colormap ();
gtk_widget_set_default_colormap (g_cmap);
Index: gimp/app/gdisplay.c
===================================================================
RCS file: /cvs/gnome/gimp/app/gdisplay.c,v
retrieving revision 1.199
diff -u -r1.199 gdisplay.c
--- gimp/app/gdisplay.c 2001/08/29 17:48:13 1.199
+++ gimp/app/gdisplay.c 2001/08/31 04:11:47
@@ -462,7 +462,7 @@
g_signal_handlers_disconnect_by_data (G_OBJECT (gdisp->gimage), gdisp);
if (gdisp->scroll_gc)
- gdk_gc_destroy (gdisp->scroll_gc);
+ gdk_gc_unref (gdisp->scroll_gc);
/* free the area lists */
gdisplay_free_area_list (gdisp->update_areas);
@@ -879,7 +879,7 @@
icongc = gdk_gc_new (gdisp->icon);
iconmaskgc = gdk_gc_new (gdisp->iconmask);
- colormap = gdk_colormap_get_system (); /* or gdk_rgb_get_cmap () */
+ colormap = gdk_colormap_get_system (); /* or gdk_rgb_get_colormap () */
gdk_color_white (colormap, &white);
gdk_color_black (colormap, &black);
@@ -1148,7 +1148,7 @@
gdisplay_transform_coords (gdisp,
gdisp->gimage->width, gdisp->gimage->height,
&x2, &y2, FALSE);
- gdk_window_get_size (gdisp->canvas->window, &w, &h);
+ gdk_drawable_get_size (gdisp->canvas->window, &w, &h);
if (x1 < 0) x1 = 0;
if (y1 < 0) y1 = 0;
@@ -1933,7 +1933,7 @@
tool_cursor,
modifier);
gdk_window_set_cursor (gdisp->canvas->window, cursor);
- gdk_cursor_destroy (cursor);
+ gdk_cursor_unref (cursor);
}
}
@@ -1968,7 +1968,7 @@
GIMP_TOOL_CURSOR_NONE,
GIMP_CURSOR_MODIFIER_NONE);
gdk_window_set_cursor (gdisp->canvas->window, cursor);
- gdk_cursor_destroy (cursor);
+ gdk_cursor_unref(cursor);
}
}
Index: gimp/app/nav_window.c
===================================================================
RCS file: /cvs/gnome/gimp/app/nav_window.c,v
retrieving revision 1.73
diff -u -r1.73 nav_window.c
--- gimp/app/nav_window.c 2001/08/29 17:48:14 1.73
+++ gimp/app/nav_window.c 2001/08/31 04:12:09
@@ -1252,7 +1252,7 @@
GDK_EXTENSION_EVENTS_ALL,
widget->window, cursor, 0);
- gdk_cursor_destroy (cursor);
+ gdk_cursor_unref (cursor);
}
static gboolean
Index: gimp/app/scroll.c
===================================================================
RCS file: /cvs/gnome/gimp/app/scroll.c,v
retrieving revision 1.26
diff -u -r1.26 scroll.c
--- gimp/app/scroll.c 2001/07/24 21:26:46 1.26
+++ gimp/app/scroll.c 2001/08/31 04:12:21
@@ -59,7 +59,7 @@
GIMP_TOOL_CURSOR_NONE,
GIMP_CURSOR_MODIFIER_NONE);
gdk_window_set_cursor (gdisp->canvas->window, cursor);
- gdk_cursor_destroy (cursor);
+ gdk_cursor_unref (cursor);
}
@@ -167,13 +167,13 @@
gdisp->offset_x += x_offset;
gdisp->offset_y += y_offset;
- gdk_draw_pixmap (gdisp->canvas->window,
- gdisp->scroll_gc,
- gdisp->canvas->window,
- src_x, src_y,
- dest_x, dest_y,
- (gdisp->disp_width - abs (x_offset)),
- (gdisp->disp_height - abs (y_offset)));
+ gdk_draw_drawable (gdisp->canvas->window,
+ gdisp->scroll_gc,
+ gdisp->canvas->window,
+ src_x, src_y,
+ dest_x, dest_y,
+ (gdisp->disp_width - abs (x_offset)),
+ (gdisp->disp_height - abs (y_offset)));
/* re-enable the active tool */
tool_manager_control_active (gdisp->gimage->gimp, RESUME, gdisp);
Index: gimp/app/selection.c
===================================================================
RCS file: /cvs/gnome/gimp/app/selection.c,v
retrieving revision 1.18
diff -u -r1.18 selection.c
--- gimp/app/selection.c 2001/07/07 12:17:09 1.18
+++ gimp/app/selection.c 2001/08/31 04:12:22
@@ -187,16 +187,16 @@
g_source_remove (select->timeout_id);
if (select->gc_in)
- gdk_gc_destroy (select->gc_in);
+ gdk_gc_unref (select->gc_in);
if (select->gc_out)
- gdk_gc_destroy (select->gc_out);
+ gdk_gc_unref (select->gc_out);
if (select->gc_layer)
- gdk_gc_destroy (select->gc_layer);
+ gdk_gc_unref (select->gc_layer);
#ifdef USE_XDRAWPOINTS
if (select->gc_white)
- gdk_gc_destroy (select->gc_white);
+ gdk_gc_unref (select->gc_white);
if (select->gc_black)
- gdk_gc_destroy (select->gc_black);
+ gdk_gc_unref (select->gc_black);
#endif
selection_free_segs (select);
@@ -365,7 +365,7 @@
gdk_draw_line (pixmap, gc, i, j, i, j);
}
- gdk_gc_destroy (gc);
+ gdk_gc_unref (gc);
return pixmap;
}
Index: gimp/app/undo.c
===================================================================
RCS file: /cvs/gnome/gimp/app/undo.c,v
retrieving revision 1.110
diff -u -r1.110 undo.c
--- gimp/app/undo.c 2001/08/07 12:42:22 1.110
+++ gimp/app/undo.c 2001/08/31 04:12:27
@@ -454,7 +454,7 @@
{
if (gdisp->disp_xoffset || gdisp->disp_yoffset)
{
- gdk_window_get_size (gdisp->canvas->window, &x, &y);
+ gdk_drawable_get_size (gdisp->canvas->window, &x, &y);
if (gdisp->disp_yoffset)
{
gdisplay_expose_area (gdisp, 0, 0,
Index: gimp/app/gui/about-dialog.c
===================================================================
RCS file: /cvs/gnome/gimp/app/gui/about-dialog.c,v
retrieving revision 1.72
diff -u -r1.72 about-dialog.c
--- gimp/app/gui/about-dialog.c 2001/08/14 16:33:26 1.72
+++ gimp/app/gui/about-dialog.c 2001/08/31 04:13:58
@@ -387,7 +387,7 @@
gtk_preview_put (GTK_PREVIEW (preview),
logo_pixmap, gc,
0, 0, 0, 0, logo_width, logo_height);
- gdk_gc_destroy (gc);
+ gdk_gc_unref (gc);
gtk_widget_unref (preview);
g_free (pixelrow);
@@ -452,12 +452,12 @@
Otherwise, it would be necessary to intersect event->area
with the pixmap boundary rectangle. */
- gdk_draw_pixmap (widget->window,
- widget->style->black_gc,
- logo_pixmap,
- event->area.x, event->area.y,
- event->area.x, event->area.y,
- event->area.width, event->area.height);
+ gdk_draw_drawable (widget->window,
+ widget->style->black_gc,
+ logo_pixmap,
+ event->area.x, event->area.y,
+ event->area.x, event->area.y,
+ event->area.width, event->area.height);
}
return FALSE;
@@ -578,7 +578,7 @@
NULL,
wilber2_xpm);
- gdk_window_get_size (pixmap, &width, &height);
+ gdk_drawable_get_size (pixmap, &width, &height);
if (logo_area->allocation.width >= width &&
logo_area->allocation.height >= height)
@@ -591,11 +591,11 @@
gdk_gc_set_clip_mask (logo_area->style->black_gc, mask);
gdk_gc_set_clip_origin (logo_area->style->black_gc, x, y);
- gdk_draw_pixmap (logo_pixmap,
- logo_area->style->black_gc,
- pixmap, 0, 0,
- x, y,
- width, height);
+ gdk_draw_drawable (logo_pixmap,
+ logo_area->style->black_gc,
+ pixmap, 0, 0,
+ x, y,
+ width, height);
gdk_gc_set_clip_mask (logo_area->style->black_gc, NULL);
gdk_gc_set_clip_origin (logo_area->style->black_gc, 0, 0);
@@ -638,12 +638,12 @@
for (j = 0; j < dissolve_width; j++, k++)
if (frame == dissolve_map[k])
{
- gdk_draw_pixmap (logo_area->window,
- logo_area->style->black_gc,
- logo_pixmap,
- j * ANIMATION_SIZE, i * ANIMATION_SIZE,
- j * ANIMATION_SIZE, i * ANIMATION_SIZE,
- ANIMATION_SIZE, ANIMATION_SIZE);
+ gdk_draw_drawable (logo_area->window,
+ logo_area->style->black_gc,
+ logo_pixmap,
+ j * ANIMATION_SIZE, i * ANIMATION_SIZE,
+ j * ANIMATION_SIZE, i * ANIMATION_SIZE,
+ ANIMATION_SIZE, ANIMATION_SIZE);
}
frame += 1;
@@ -707,11 +707,11 @@
scroll_area->allocation.width - offset,
scroll_area->style->font->ascent,
scroll_text[cur_scroll_text]);
- gdk_draw_pixmap (scroll_area->window,
- scroll_area->style->black_gc,
- scroll_pixmap, 0, 0, 0, 0,
- scroll_area->allocation.width,
- scroll_area->allocation.height);
+ gdk_draw_drawable (scroll_area->window,
+ scroll_area->style->black_gc,
+ scroll_pixmap, 0, 0, 0, 0,
+ scroll_area->allocation.width,
+ scroll_area->allocation.height);
offset += 15;
if (scroll_state == 0)
Index: gimp/app/gui/color-area.c
===================================================================
RCS file: /cvs/gnome/gimp/app/gui/color-area.c,v
retrieving revision 1.46
diff -u -r1.46 color-area.c
--- gimp/app/gui/color-area.c 2001/08/17 14:27:22 1.46
+++ gimp/app/gui/color-area.c 2001/08/31 04:14:03
@@ -108,7 +108,7 @@
gint rect_w, rect_h;
gint width, height;
- gdk_window_get_size (color_area_pixmap, &width, &height);
+ gdk_drawable_get_size (color_area_pixmap, &width, &height);
rect_w = width * 0.65;
rect_h = height * 0.65;
@@ -210,7 +210,7 @@
if (!color_area_pixmap || !color_area_gc)
return;
- gdk_window_get_size (color_area_pixmap, &width, &height);
+ gdk_drawable_get_size (color_area_pixmap, &width, &height);
rect_w = width * 0.65;
rect_h = height * 0.65;
@@ -261,24 +261,24 @@
0, 0, rect_w, rect_h);
/* draw the default pixmap */
- gdk_window_get_size (default_pixmap, &def_width, &def_height);
- gdk_draw_pixmap (color_area_pixmap, color_area_gc, default_pixmap,
- 0, 0, 0, height - def_height, def_width, def_height);
- gdk_draw_pixmap (color_area_mask, mask_gc, default_mask,
- 0, 0, 0, height - def_height, def_width, def_height);
+ gdk_drawable_get_size (default_pixmap, &def_width, &def_height);
+ gdk_draw_drawable (color_area_pixmap, color_area_gc, default_pixmap,
+ 0, 0, 0, height - def_height, def_width, def_height);
+ gdk_draw_drawable (color_area_mask, mask_gc, default_mask,
+ 0, 0, 0, height - def_height, def_width, def_height);
/* draw the swap pixmap */
- gdk_window_get_size (swap_pixmap, &swap_width, &swap_height);
- gdk_draw_pixmap (color_area_pixmap, color_area_gc, swap_pixmap,
- 0, 0, width - swap_width, 0, swap_width, swap_height);
- gdk_draw_pixmap (color_area_mask, mask_gc, swap_mask,
- 0, 0, width - swap_width, 0, swap_width, swap_height);
+ gdk_drawable_get_size (swap_pixmap, &swap_width, &swap_height);
+ gdk_draw_drawable (color_area_pixmap, color_area_gc, swap_pixmap,
+ 0, 0, width - swap_width, 0, swap_width, swap_height);
+ gdk_draw_drawable (color_area_mask, mask_gc, swap_mask,
+ 0, 0, width - swap_width, 0, swap_width, swap_height);
/* draw the widget */
gdk_gc_set_clip_mask (color_area_gc, color_area_mask);
gdk_gc_set_clip_origin (color_area_gc, 0, 0);
- gdk_draw_pixmap (color_area->window, color_area_gc, color_area_pixmap,
- 0, 0, 0, 0, width, height);
+ gdk_draw_drawable (color_area->window, color_area_gc, color_area_pixmap,
+ 0, 0, 0, 0, width, height);
/* reset the clip mask */
gdk_gc_set_clip_mask (color_area_gc, NULL);
Index: gimp/app/gui/color-select.c
===================================================================
RCS file: /cvs/gnome/gimp/app/gui/color-select.c,v
retrieving revision 1.48
diff -u -r1.48 color-select.c
--- gimp/app/gui/color-select.c 2001/08/14 16:33:26 1.48
+++ gimp/app/gui/color-select.c 2001/08/31 04:14:09
@@ -1454,7 +1454,7 @@
{
notebook_glue *glue = data;
- gdk_gc_destroy (glue->csp->gc);
+ gdk_gc_unref (glue->csp->gc);
g_free (glue->csp);
/* don't need to destroy the widget, since it's done by the caller
Index: gimp/app/gui/gradient-editor.c
===================================================================
RCS file: /cvs/gnome/gimp/app/gui/gradient-editor.c,v
retrieving revision 1.138
diff -u -r1.138 gradient-editor.c
--- gimp/app/gui/gradient-editor.c 2001/08/29 17:48:16 1.138
+++ gimp/app/gui/gradient-editor.c 2001/08/31 04:14:31
@@ -2159,7 +2159,7 @@
cheight = GRAD_CONTROL_HEIGHT;
if (gradient_editor->control_pixmap)
- gdk_window_get_size (gradient_editor->control_pixmap, &pwidth, &pheight);
+ gdk_drawable_get_size (gradient_editor->control_pixmap, &pwidth, &pheight);
if (! gradient_editor->control_pixmap ||
(cwidth != pwidth) ||
@@ -2192,11 +2192,11 @@
adjustment->value,
adjustment->value + adjustment->page_size);
- gdk_draw_pixmap (gradient_editor->control->window,
- gradient_editor->control->style->black_gc,
- gradient_editor->control_pixmap,
- 0, 0, 0, 0,
- cwidth, cheight);
+ gdk_draw_drawable (gradient_editor->control->window,
+ gradient_editor->control->style->black_gc,
+ gradient_editor->control_pixmap,
+ 0, 0, 0, 0,
+ cwidth, cheight);
}
static void
@@ -2343,7 +2343,7 @@
*/
adjustment = GTK_ADJUSTMENT (gradient_editor->scroll_data);
- gdk_window_get_size (gradient_editor->control_pixmap, &pwidth, &pheight);
+ gdk_drawable_get_size (gradient_editor->control_pixmap, &pwidth, &pheight);
return RINT ((pwidth - 1) * (pos - adjustment->value) / adjustment->page_size);
}
@@ -2358,7 +2358,7 @@
/* Calculate the gradient position that corresponds to widget's coordinates */
adjustment = GTK_ADJUSTMENT (gradient_editor->scroll_data);
- gdk_window_get_size (gradient_editor->control_pixmap, &pwidth, &pheight);
+ gdk_drawable_get_size (gradient_editor->control_pixmap, &pwidth, &pheight);
return adjustment->page_size * pos / (pwidth - 1) + adjustment->value;
}
Index: gimp/app/gui/gui.c
===================================================================
RCS file: /cvs/gnome/gimp/app/gui/gui.c,v
retrieving revision 1.29
diff -u -r1.29 gui.c
--- gimp/app/gui/gui.c 2001/08/14 16:33:26 1.29
+++ gimp/app/gui/gui.c 2001/08/31 04:14:34
@@ -475,7 +475,7 @@
NULL,
wilber2_xpm);
- gdk_window_get_size (pixmap, &width, &height);
+ gdk_drawable_get_size (pixmap, &width, &height);
if (widget->allocation.width >= width &&
widget->allocation.height >= height)
@@ -488,11 +488,11 @@
gdk_gc_set_clip_mask (widget->style->black_gc, mask);
gdk_gc_set_clip_origin (widget->style->black_gc, x, y);
- gdk_draw_pixmap (widget->window,
- widget->style->black_gc,
- pixmap, 0, 0,
- x, y,
- width, height);
+ gdk_draw_drawable (widget->window,
+ widget->style->black_gc,
+ pixmap, 0, 0,
+ x, y,
+ width, height);
gdk_gc_set_clip_mask (widget->style->black_gc, NULL);
gdk_gc_set_clip_origin (widget->style->black_gc, 0, 0);
Index: gimp/app/gui/splash.c
===================================================================
RCS file: /cvs/gnome/gimp/app/gui/splash.c,v
retrieving revision 1.7
diff -u -r1.7 splash.c
--- gimp/app/gui/splash.c 2001/08/17 14:27:22 1.7
+++ gimp/app/gui/splash.c 2001/08/31 04:15:10
@@ -296,7 +296,7 @@
gtk_preview_put (GTK_PREVIEW (preview),
logo_pixmap, gc,
0, 0, 0, 0, logo_width, logo_height);
- gdk_gc_destroy (gc);
+ gdk_gc_unref (gc);
gtk_widget_unref (preview);
g_free (pixelrow);
@@ -365,13 +365,13 @@
static void
splash_logo_draw (GtkWidget *widget)
{
- gdk_draw_pixmap (widget->window,
- widget->style->black_gc,
- logo_pixmap,
- 0, 0,
- ((logo_area_width - logo_width) / 2),
- ((logo_area_height - logo_height) / 2),
- logo_width, logo_height);
+ gdk_draw_drawable (widget->window,
+ widget->style->black_gc,
+ logo_pixmap,
+ 0, 0,
+ ((logo_area_width - logo_width) / 2),
+ ((logo_area_height - logo_height) / 2),
+ logo_width, logo_height);
}
static void
Index: gimp/app/tools/gimpcurvestool.c
===================================================================
RCS file: /cvs/gnome/gimp/app/tools/gimpcurvestool.c,v
retrieving revision 1.89
diff -u -r1.89 gimpcurvestool.c
--- gimp/app/tools/gimpcurvestool.c 2001/08/14 14:53:54 1.89
+++ gimp/app/tools/gimpcurvestool.c 2001/08/31 04:17:04
@@ -1075,8 +1075,8 @@
GRAPH_HEIGHT,
buf);
- gdk_draw_pixmap (cd->graph->window, cd->graph->style->black_gc, cd->pixmap,
- 0, 0, 0, 0, GRAPH_WIDTH + RADIUS * 2, GRAPH_HEIGHT + RADIUS * 2);
+ gdk_draw_drawable (cd->graph->window, cd->graph->style->black_gc, cd->pixmap,
+ 0, 0, 0, 0, GRAPH_WIDTH + RADIUS * 2, GRAPH_HEIGHT + RADIUS * 2);
}
}
Index: gimp/plug-ins/Lighting/lighting_preview.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/Lighting/lighting_preview.c,v
retrieving revision 1.15
diff -u -r1.15 lighting_preview.c
--- gimp/plug-ins/Lighting/lighting_preview.c 2001/01/25 01:19:46 1.15
+++ gimp/plug-ins/Lighting/lighting_preview.c 2001/08/31 04:20:51
@@ -358,7 +358,7 @@
gdk_gc_set_function(gc,GDK_COPY);
gdk_draw_image(previewarea->window,gc,backbuf.image,0,0,backbuf.x,backbuf.y,
backbuf.w,backbuf.h);
- gdk_image_destroy(backbuf.image);
+ gdk_image_unref(backbuf.image);
backbuf.image=NULL;
} */
}
@@ -456,14 +456,14 @@
newcursor = gdk_cursor_new (GDK_WATCH);
gdk_window_set_cursor (previewarea->window, newcursor);
- gdk_cursor_destroy (newcursor);
+ gdk_cursor_unref (newcursor);
gdk_flush ();
compute_preview (startx, starty, pw, ph);
newcursor = gdk_cursor_new (GDK_HAND2);
gdk_window_set_cursor (previewarea->window, newcursor);
- gdk_cursor_destroy (newcursor);
+ gdk_cursor_unref (newcursor);
gdk_flush ();
clear_light_marker ();
Index: gimp/plug-ins/Lighting/lighting_ui.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/Lighting/lighting_ui.c,v
retrieving revision 1.30
diff -u -r1.30 lighting_ui.c
--- gimp/plug-ins/Lighting/lighting_ui.c 2001/08/03 19:43:18 1.30
+++ gimp/plug-ins/Lighting/lighting_ui.c 2001/08/31 04:20:55
@@ -1231,7 +1231,7 @@
newcursor = gdk_cursor_new (GDK_HAND2);
gdk_window_set_cursor (previewarea->window, newcursor);
- gdk_cursor_destroy (newcursor);
+ gdk_cursor_unref (newcursor);
gdk_flush ();
}
@@ -1243,7 +1243,7 @@
g_free (preview_rgb_data);
if (image != NULL)
- gdk_image_destroy (image);
+ gdk_image_unref (image);
gck_visualinfo_destroy (visinfo);
gtk_widget_destroy (appwin);
Index: gimp/plug-ins/MapObject/mapobject_preview.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/MapObject/mapobject_preview.c,v
retrieving revision 1.15
diff -u -r1.15 mapobject_preview.c
--- gimp/plug-ins/MapObject/mapobject_preview.c 2001/01/25 01:19:47 1.15
+++ gimp/plug-ins/MapObject/mapobject_preview.c 2001/08/31 04:21:00
@@ -348,7 +348,7 @@
backbuf.x, backbuf.y,
backbuf.w, backbuf.h);
- gdk_image_destroy (backbuf.image);
+ gdk_image_unref (backbuf.image);
backbuf.image = NULL;
}
}
@@ -420,14 +420,14 @@
newcursor = gdk_cursor_new (GDK_WATCH);
gdk_window_set_cursor (previewarea->window, newcursor);
- gdk_cursor_destroy (newcursor);
+ gdk_cursor_unref (newcursor);
gdk_flush ();
compute_preview (0, 0, width - 1, height - 1, pw, ph);
newcursor = gdk_cursor_new (GDK_HAND2);
gdk_window_set_cursor(previewarea->window, newcursor);
- gdk_cursor_destroy (newcursor);
+ gdk_cursor_unref (newcursor);
gdk_flush ();
clear_light_marker ();
Index: gimp/plug-ins/MapObject/mapobject_ui.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/MapObject/mapobject_ui.c,v
retrieving revision 1.26
diff -u -r1.26 mapobject_ui.c
--- gimp/plug-ins/MapObject/mapobject_ui.c 2001/08/03 19:43:18 1.26
+++ gimp/plug-ins/MapObject/mapobject_ui.c 2001/08/31 04:21:07
@@ -1486,7 +1486,7 @@
newcursor = gdk_cursor_new (GDK_HAND2);
gdk_window_set_cursor (previewarea->window, newcursor);
- gdk_cursor_destroy (newcursor);
+ gdk_cursor_unref (newcursor);
gdk_flush ();
}
@@ -1501,7 +1501,7 @@
g_free (preview_rgb_data);
if (image != NULL)
- gdk_image_destroy (image);
+ gdk_image_unref (image);
gck_visualinfo_destroy (visinfo);
gtk_widget_destroy (appwin);
Index: gimp/plug-ins/common/animationplay.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/animationplay.c,v
retrieving revision 1.43
diff -u -r1.43 animationplay.c
--- gimp/plug-ins/common/animationplay.c 2001/08/03 19:51:31 1.43
+++ gimp/plug-ins/common/animationplay.c 2001/08/31 04:21:32
@@ -848,7 +848,7 @@
cursor = gdk_cursor_new (GDK_CENTER_PTR);
gdk_window_set_cursor(shape_window->window, cursor);
- gdk_cursor_destroy (cursor);
+ gdk_cursor_unref (cursor);
gtk_signal_connect (GTK_OBJECT (shape_window), "button_press_event",
GTK_SIGNAL_FUNC (shape_pressed),NULL);
@@ -1625,7 +1625,7 @@
gtk_preview_put (GTK_PREVIEW (shape_preview),
shape_pixmap, gc,
0, 0, 0, 0, width, height);
- gdk_gc_destroy (gc);
+ gdk_gc_unref (gc);
gdk_window_set_back_pixmap(shape_window->window, shape_pixmap,
FALSE);
Index: gimp/plug-ins/common/curve_bend.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/common/curve_bend.c,v
retrieving revision 1.29
diff -u -r1.29 curve_bend.c
--- gimp/plug-ins/common/curve_bend.c 2001/08/03 19:51:31 1.29
+++ gimp/plug-ins/common/curve_bend.c 2001/08/31 04:22:01
@@ -1627,8 +1627,8 @@
}
- gdk_draw_pixmap (cd->graph->window, cd->graph->style->black_gc, cd->pixmap,
- 0, 0, 0, 0, GRAPH_WIDTH + RADIUS * 2, GRAPH_HEIGHT + RADIUS * 2);
+ gdk_draw_drawable (cd->graph->window, cd->graph->style->black_gc, cd->pixmap,
+ 0, 0, 0, 0, GRAPH_WIDTH + RADIUS * 2, GRAPH_HEIGHT + RADIUS * 2);
}
}
Index: gimp/plug-ins/gap/gap_navigator_dialog.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/gap/gap_navigator_dialog.c,v
retrieving revision 1.12
diff -u -r1.12 gap_navigator_dialog.c
--- gimp/plug-ins/gap/gap_navigator_dialog.c 2001/08/03 19:51:42 1.12
+++ gimp/plug-ins/gap/gap_navigator_dialog.c 2001/08/31 04:27:29
@@ -2212,7 +2212,7 @@
int foldh, foldw;
int i;
- gdk_window_get_size (pixmap, &w, &h);
+ gdk_drawable_get_size (pixmap, &w, &h);
x1 = 2;
y1 = h / 8 + 2;
@@ -2389,12 +2389,12 @@
{
frame_widget_preview_redraw (frame_widget);
- gdk_draw_pixmap (widget->window,
- widget->style->black_gc,
- *pixmap,
- 0, 0, 2, 2,
- naviD->image_width,
- naviD->image_height);
+ gdk_draw_drawable (widget->window,
+ widget->style->black_gc,
+ *pixmap,
+ 0, 0, 2, 2,
+ naviD->image_width,
+ naviD->image_height);
}
else
{
@@ -2439,10 +2439,10 @@
if ((w > 0) && (h > 0))
{
- gdk_draw_pixmap (widget->window,
- widget->style->black_gc,
- *pixmap,
- sx, sy, dx, dy, w, h);
+ gdk_draw_drawable (widget->window,
+ widget->style->black_gc,
+ *pixmap,
+ sx, sy, dx, dy, w, h);
}
}
Index: gimp/plug-ins/gfig/gfig.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/gfig/gfig.c,v
retrieving revision 1.70
diff -u -r1.70 gfig.c
--- gimp/plug-ins/gfig/gfig.c 2001/08/03 19:51:48 1.70
+++ gimp/plug-ins/gfig/gfig.c 2001/08/31 04:28:05
@@ -3912,7 +3912,7 @@
gimp_ui_init ("gfig", TRUE);
yyy = gdk_rgb_get_visual ();
- xxx = gdk_rgb_get_cmap ();
+ xxx = gdk_rgb_get_colormap ();
plug_in_parse_gfig_path ();
Index: gimp/plug-ins/gimpressionist/gimpressionist.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/gimpressionist/gimpressionist.c,v
retrieving revision 1.18
diff -u -r1.18 gimpressionist.c
--- gimp/plug-ins/gimpressionist/gimpressionist.c 2001/08/03 19:51:52 1.18
+++ gimp/plug-ins/gimpressionist/gimpressionist.c 2001/08/31 04:29:40
@@ -408,7 +408,7 @@
gtk_init(&argc, &argv);
gtk_rc_parse (gimp_gtkrc ());
- gtk_widget_set_default_colormap (gdk_rgb_get_cmap());
+ gtk_widget_set_default_colormap (gdk_rgb_get_colormap());
}
else
{
Index: gimp/plug-ins/ifscompose/ifscompose.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/ifscompose/ifscompose.c,v
retrieving revision 1.46
diff -u -r1.46 ifscompose.c
--- gimp/plug-ins/ifscompose/ifscompose.c 2001/08/03 19:51:53 1.46
+++ gimp/plug-ins/ifscompose/ifscompose.c 2001/08/31 04:30:32
@@ -1061,7 +1061,7 @@
gdk_flush ();
- gdk_gc_destroy (ifsDesign->selected_gc);
+ gdk_gc_unref (ifsDesign->selected_gc);
g_free(ifsD);
@@ -1573,12 +1573,12 @@
ifsDesign->area->style->font);
}
- gdk_draw_pixmap(widget->window,
- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
- ifsDesign->pixmap,
- event->area.x, event->area.y,
- event->area.x, event->area.y,
- event->area.width, event->area.height);
+ gdk_draw_drawable(widget->window,
+ widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+ ifsDesign->pixmap,
+ event->area.x, event->area.y,
+ event->area.x, event->area.y,
+ event->area.width, event->area.height);
return FALSE;
}
@@ -1600,7 +1600,7 @@
if (ifsDesign->pixmap)
{
- gdk_pixmap_unref(ifsDesign->pixmap);
+ gdk_drawable_unref(ifsDesign->pixmap);
}
ifsDesign->pixmap = gdk_pixmap_new(widget->window,
widget->allocation.width,
Index: gimp/plug-ins/imagemap/imap_main.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/imagemap/imap_main.c,v
retrieving revision 1.16
diff -u -r1.16 imap_main.c
--- gimp/plug-ins/imagemap/imap_main.c 2001/06/14 20:07:30 1.16
+++ gimp/plug-ins/imagemap/imap_main.c 2001/08/31 04:31:37
@@ -211,7 +211,7 @@
static void
init_preferences(void)
{
- GdkColormap *colormap = gdk_window_get_colormap(_dlg->window);
+ GdkColormap *colormap = gdk_drawable_get_colormap(_dlg->window);
ColorSelData_t *colors = &_preferences.colors;
colors->normal_fg.red = 0;
Index: gimp/plug-ins/imagemap/imap_preferences.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/imagemap/imap_preferences.c,v
retrieving revision 1.4
diff -u -r1.4 imap_preferences.c
--- gimp/plug-ins/imagemap/imap_preferences.c 2000/02/17 08:36:46 1.4
+++ gimp/plug-ins/imagemap/imap_preferences.c 2001/08/31 04:31:53
@@ -308,7 +308,7 @@
gdk_color->green = (guint16)(color[1]*65535.0);
gdk_color->blue = (guint16)(color[2]*65535.0);
- colormap = gdk_window_get_colormap(button->window);
+ colormap = gdk_drawable_get_colormap(button->window);
gdk_color_alloc(colormap, gdk_color);
gdk_window_set_background(button->window, gdk_color);
gdk_window_clear(button->window);
Index: gimp/plug-ins/imagemap/imap_preview.c
===================================================================
RCS file: /cvs/gnome/gimp/plug-ins/imagemap/imap_preview.c,v
retrieving revision 1.6
diff -u -r1.6 imap_preview.c
--- gimp/plug-ins/imagemap/imap_preview.c 2001/07/28 19:40:06 1.6
+++ gimp/plug-ins/imagemap/imap_preview.c 2001/08/31 04:31:58
@@ -354,7 +354,7 @@
GdkCursorType prev_cursor = preview->cursor;
GdkCursor *cursor = gdk_cursor_new(cursor_type);
gdk_window_set_cursor(preview->window->window, cursor);
- gdk_cursor_destroy(cursor);
+ gdk_cursor_unref(cursor);
gdk_flush();
preview->cursor = cursor_type;
return prev_cursor;
