dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/colormaps.c app/gdisplay.c app/nav_window.c app/scroll.c 

2001-08-31  Thomas Canty  <tommydal@optushome.com.au>
	* 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
This commit is contained in:
Thomas Canty 2001-08-31 14:01:47 +00:00 committed by Thomas Canty
parent 51f99c3259
commit 4e9fcfa632
41 changed files with 242 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ChangeLog
View File

@ -1,3 +1,32 @@
2001-08-31 Thomas Canty <tommydal@optushome.com.au>
* 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@gimp.org>
* app/plug_in.c

4
app/base/curves.c
View File

@ -1075,8 +1075,8 @@ curves_update (CurvesDialog *cd,
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);
}
}

2
app/colormaps.c
View File

@ -72,7 +72,7 @@ get_standard_colormaps (void)
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);

2
app/core/gimpimage-undo-push.c
View File

@ -454,7 +454,7 @@ pop_stack (GimpImage *gimage,
{
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,

10
app/core/gimpprojection.c
View File

@ -462,7 +462,7 @@ gdisplay_delete (GDisplay *gdisp)
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 @@ gdisplay_update_icon (GDisplay *gdisp)
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_draw_guide (GDisplay *gdisp,
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 @@ gdisplay_real_install_tool_cursor (GDisplay *gdisp,
tool_cursor,
modifier);
gdk_window_set_cursor (gdisp->canvas->window, cursor);
gdk_cursor_destroy (cursor);
gdk_cursor_unref (cursor);
}
}
@ -1968,7 +1968,7 @@ gdisplay_install_override_cursor (GDisplay *gdisp,
GIMP_TOOL_CURSOR_NONE,
GIMP_CURSOR_MODIFIER_NONE);
gdk_window_set_cursor (gdisp->canvas->window, cursor);
gdk_cursor_destroy (cursor);
gdk_cursor_unref(cursor);
}
}

48
app/dialogs/about-dialog.c
View File

@ -387,7 +387,7 @@ about_dialog_load_logo (GtkWidget *window)
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 @@ about_dialog_logo_expose (GtkWidget *widget,
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 @@ about_dialog_tool_drop (GtkWidget *widget,
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 @@ about_dialog_tool_drop (GtkWidget *widget,
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 @@ about_dialog_timer (gpointer data)
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 @@ about_dialog_timer (gpointer data)
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)

16
app/display/gimpdisplay-scroll.c
View File

@ -59,7 +59,7 @@ start_grab_and_scroll (GDisplay *gdisp,
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 @@ scroll_display (GDisplay *gdisp,
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);

12
app/display/gimpdisplay-selection.c
View File

@ -187,16 +187,16 @@ selection_free (Selection *select)
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 @@ create_cycled_ants_pixmap (GdkWindow *window,
gdk_draw_line (pixmap, gc, i, j, i, j);
}
gdk_gc_destroy (gc);
gdk_gc_unref (gc);
return pixmap;
}

10
app/display/gimpdisplay.c
View File

@ -462,7 +462,7 @@ gdisplay_delete (GDisplay *gdisp)
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 @@ gdisplay_update_icon (GDisplay *gdisp)
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_draw_guide (GDisplay *gdisp,
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 @@ gdisplay_real_install_tool_cursor (GDisplay *gdisp,
tool_cursor,
modifier);
gdk_window_set_cursor (gdisp->canvas->window, cursor);
gdk_cursor_destroy (cursor);
gdk_cursor_unref (cursor);
}
}
@ -1968,7 +1968,7 @@ gdisplay_install_override_cursor (GDisplay *gdisp,
GIMP_TOOL_CURSOR_NONE,
GIMP_CURSOR_MODIFIER_NONE);
gdk_window_set_cursor (gdisp->canvas->window, cursor);
gdk_cursor_destroy (cursor);
gdk_cursor_unref(cursor);
}
}

16
app/display/gimpdisplayshell-scroll.c
View File

@ -59,7 +59,7 @@ start_grab_and_scroll (GDisplay *gdisp,
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 @@ scroll_display (GDisplay *gdisp,
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);

12
app/display/gimpdisplayshell-selection.c
View File

@ -187,16 +187,16 @@ selection_free (Selection *select)
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 @@ create_cycled_ants_pixmap (GdkWindow *window,
gdk_draw_line (pixmap, gc, i, j, i, j);
}
gdk_gc_destroy (gc);
gdk_gc_unref (gc);
return pixmap;
}

2
app/display/gimpnavigationeditor.c
View File

@ -1252,7 +1252,7 @@ nav_dialog_grab_pointer (NavigationDialog *nav_dialog,
GDK_EXTENSION_EVENTS_ALL,
widget->window, cursor, 0);
gdk_cursor_destroy (cursor);
gdk_cursor_unref (cursor);
}
static gboolean

2
app/display/gimpnavigationview.c
View File

@ -1252,7 +1252,7 @@ nav_dialog_grab_pointer (NavigationDialog *nav_dialog,
GDK_EXTENSION_EVENTS_ALL,
widget->window, cursor, 0);
gdk_cursor_destroy (cursor);
gdk_cursor_unref (cursor);
}
static gboolean

10
app/gdisplay.c
View File

@ -462,7 +462,7 @@ gdisplay_delete (GDisplay *gdisp)
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 @@ gdisplay_update_icon (GDisplay *gdisp)
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_draw_guide (GDisplay *gdisp,
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 @@ gdisplay_real_install_tool_cursor (GDisplay *gdisp,
tool_cursor,
modifier);
gdk_window_set_cursor (gdisp->canvas->window, cursor);
gdk_cursor_destroy (cursor);
gdk_cursor_unref (cursor);
}
}
@ -1968,7 +1968,7 @@ gdisplay_install_override_cursor (GDisplay *gdisp,
GIMP_TOOL_CURSOR_NONE,
GIMP_CURSOR_MODIFIER_NONE);
gdk_window_set_cursor (gdisp->canvas->window, cursor);
gdk_cursor_destroy (cursor);
gdk_cursor_unref(cursor);
}
}

48
app/gui/about-dialog.c
View File

@ -387,7 +387,7 @@ about_dialog_load_logo (GtkWidget *window)
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 @@ about_dialog_logo_expose (GtkWidget *widget,
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 @@ about_dialog_tool_drop (GtkWidget *widget,
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 @@ about_dialog_tool_drop (GtkWidget *widget,
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 @@ about_dialog_timer (gpointer data)
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 @@ about_dialog_timer (gpointer data)
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)

28
app/gui/color-area.c
View File

@ -108,7 +108,7 @@ color_area_target (gint x,
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 @@ color_area_draw (void)
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 @@ color_area_draw (void)
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);

2
app/gui/color-select.c
View File

@ -1454,7 +1454,7 @@ color_select_notebook_free (gpointer data)
{
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

16
app/gui/gradient-editor.c
View File

@ -2159,7 +2159,7 @@ control_update (GradientEditor *gradient_editor,
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 @@ control_update (GradientEditor *gradient_editor,
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 @@ control_calc_p_pos (GradientEditor *gradient_editor,
*/
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 @@ control_calc_g_pos (GradientEditor *gradient_editor,
/* 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;
}

12
app/gui/gui.c
View File

@ -475,7 +475,7 @@ gui_rotate_the_shield_harmonics (GtkWidget *widget,
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 @@ gui_rotate_the_shield_harmonics (GtkWidget *widget,
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);

16
app/gui/splash.c
View File

@ -296,7 +296,7 @@ splash_logo_load (void)
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 @@ splash_text_draw (GtkWidget *widget)
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

2
app/nav_window.c
View File

@ -1252,7 +1252,7 @@ nav_dialog_grab_pointer (NavigationDialog *nav_dialog,
GDK_EXTENSION_EVENTS_ALL,
widget->window, cursor, 0);
gdk_cursor_destroy (cursor);
gdk_cursor_unref (cursor);
}
static gboolean

16
app/scroll.c
View File

@ -59,7 +59,7 @@ start_grab_and_scroll (GDisplay *gdisp,
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 @@ scroll_display (GDisplay *gdisp,
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);

12
app/selection.c
View File

@ -187,16 +187,16 @@ selection_free (Selection *select)
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 @@ create_cycled_ants_pixmap (GdkWindow *window,
gdk_draw_line (pixmap, gc, i, j, i, j);
}
gdk_gc_destroy (gc);
gdk_gc_unref (gc);
return pixmap;
}

4
app/tools/gimpcurvestool.c
View File

@ -1075,8 +1075,8 @@ curves_update (CurvesDialog *cd,
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);
}
}

2
app/undo.c
View File

@ -454,7 +454,7 @@ pop_stack (GimpImage *gimage,
{
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,

16
app/widgets/gimpgradienteditor.c
View File

@ -2159,7 +2159,7 @@ control_update (GradientEditor *gradient_editor,
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 @@ control_update (GradientEditor *gradient_editor,
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 @@ control_calc_p_pos (GradientEditor *gradient_editor,
*/
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 @@ control_calc_g_pos (GradientEditor *gradient_editor,
/* 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;
}

28
app/widgets/gimptoolbox-color-area.c
View File

@ -108,7 +108,7 @@ color_area_target (gint x,
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 @@ color_area_draw (void)
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 @@ color_area_draw (void)
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);

2
libgimpwidgets/gimpcolorselect.c
View File

@ -1454,7 +1454,7 @@ color_select_notebook_free (gpointer data)
{
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

6
plug-ins/Lighting/lighting_preview.c
View File

@ -358,7 +358,7 @@ clear_light_marker (void)
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 @@ draw_preview_image (gint recompute)
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 ();

4
plug-ins/Lighting/lighting_ui.c
View File

@ -1231,7 +1231,7 @@ main_dialog (GimpDrawable *drawable)
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 @@ main_dialog (GimpDrawable *drawable)
g_free (preview_rgb_data);
if (image != NULL)
gdk_image_destroy (image);
gdk_image_unref (image);
gck_visualinfo_destroy (visinfo);
gtk_widget_destroy (appwin);

6
plug-ins/MapObject/mapobject_preview.c
View File

@ -348,7 +348,7 @@ clear_light_marker (void)
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 @@ draw_preview_image (gint docompute)
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 ();

4
plug-ins/MapObject/mapobject_ui.c
View File

@ -1486,7 +1486,7 @@ main_dialog (GimpDrawable *drawable)
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 @@ main_dialog (GimpDrawable *drawable)
g_free (preview_rgb_data);
if (image != NULL)
gdk_image_destroy (image);
gdk_image_unref (image);
gck_visualinfo_destroy (visinfo);
gtk_widget_destroy (appwin);

4
plug-ins/common/animationplay.c
View File

@ -848,7 +848,7 @@ build_dialog (GimpImageBaseType basetype,
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 @@ show_frame (void)
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);

4
plug-ins/common/curve_bend.c
View File

@ -1627,8 +1627,8 @@ bender_update (BenderDialog *cd,
}
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);
}
}

22
plug-ins/gap/gap_navigator_dialog.c
View File

@ -2212,7 +2212,7 @@ render_no_preview (GtkWidget *widget,
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_events (GtkWidget *widget,
{
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 @@ frame_widget_preview_events (GtkWidget *widget,
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);
}
}

2
plug-ins/gfig/gfig.c
View File

@ -3912,7 +3912,7 @@ gfig_dialog (void)
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 ();

2
plug-ins/gimpressionist/gimpressionist.c
View File

@ -408,7 +408,7 @@ int create_dialog(void)
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
{

16
plug-ins/ifscompose/ifscompose.c
View File

@ -1061,7 +1061,7 @@ ifs_compose_dialog (GimpDrawable *drawable)
gdk_flush ();
gdk_gc_destroy (ifsDesign->selected_gc);
gdk_gc_unref (ifsDesign->selected_gc);
g_free(ifsD);
@ -1573,12 +1573,12 @@ design_area_expose (GtkWidget *widget,
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 @@ design_area_configure (GtkWidget *widget,
if (ifsDesign->pixmap)
{
gdk_pixmap_unref(ifsDesign->pixmap);
gdk_drawable_unref(ifsDesign->pixmap);
}
ifsDesign->pixmap = gdk_pixmap_new(widget->window,
widget->allocation.width,

2
plug-ins/imagemap/imap_main.c
View File

@ -211,7 +211,7 @@ get_preferences(void)
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;

2
plug-ins/imagemap/imap_preferences.c
View File

@ -308,7 +308,7 @@ change_color(PreferencesDialog_t *param, GtkWidget *button,
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);

2
plug-ins/imagemap/imap_preview.c
View File

@ -354,7 +354,7 @@ preview_set_cursor(Preview_t *preview, GdkCursorType cursor_type)
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;