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

fixed typo. 

2001-07-25  Sven Neumann  <sven@gimp.org>

	* app/devices.c: fixed typo.

	* app/gdisplay.c
	* app/undo_history.c
	* app/user_install.c
	* app/gui/about-dialog.c
	* app/gui/color-area.c
	* app/gui/gradient-editor.c
	* app/gui/gui.c
	* app/gui/paths-dialog.c
	* app/gui/splash.c
	* app/tools/gimpcurvestool.c
	* app/tools/gimpinktool.c
	* app/tools/gimptexttool.c:
	s/gdk_[bit|pix]map_unref/gdk_drawable_unref/

	* app/xcf/xcf-load.c: use GObject functions

	* plug-ins/common/animationplay.c: include GDK backend specific
	headers
This commit is contained in:
Sven Neumann 2001-07-25 13:21:57 +00:00 committed by Sven Neumann
parent b3a0161fd6
commit 98f9812ebb
29 changed files with 114 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -1,3 +1,26 @@
2001-07-25 Sven Neumann <sven@gimp.org>
* app/devices.c: fixed typo.
* app/gdisplay.c
* app/undo_history.c
* app/user_install.c
* app/gui/about-dialog.c
* app/gui/color-area.c
* app/gui/gradient-editor.c
* app/gui/gui.c
* app/gui/paths-dialog.c
* app/gui/splash.c
* app/tools/gimpcurvestool.c
* app/tools/gimpinktool.c
* app/tools/gimptexttool.c:
s/gdk_[bit|pix]map_unref/gdk_drawable_unref/
* app/xcf/xcf-load.c: use GObject functions
* plug-ins/common/animationplay.c: include GDK backend specific
headers
2001-07-25 Sven Neumann <sven@gimp.org>
* configure.in: only build X11 specific plug-ins and tools if

2
app/base/curves.c
View File

@ -624,7 +624,7 @@ curves_free (void)
}
if (curves_dialog->pixmap)
gdk_pixmap_unref (curves_dialog->pixmap);
gdk_drawable_unref (curves_dialog->pixmap);
gtk_widget_destroy (curves_dialog->shell);
}

4
app/core/gimpprojection.c
View File

@ -479,8 +479,8 @@ gdisplay_delete (GDisplay *gdisp)
if (gdisp->icon_idle_id)
g_source_remove (gdisp->icon_idle_id);
gdk_pixmap_unref (gdisp->icon);
gdk_pixmap_unref (gdisp->iconmask);
gdk_drawable_unref (gdisp->icon);
gdk_drawable_unref (gdisp->iconmask);
gtk_widget_unref (gdisp->shell);

2
app/devices.c
View File

@ -283,7 +283,7 @@ devices_init (void)
device_info->num_axes = device->num_axes;
device_info->axes = NULL;
device_info->num_keys = device->num_axes;
device_info->num_keys = device->num_keys;
device_info->keys = NULL;
device_info->context = gimp_create_context (the_gimp,

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

@ -600,8 +600,8 @@ about_dialog_tool_drop (GtkWidget *widget,
gdk_gc_set_clip_origin (logo_area->style->black_gc, 0, 0);
}
gdk_pixmap_unref (pixmap);
gdk_bitmap_unref (mask);
gdk_drawable_unref (pixmap);
gdk_drawable_unref (mask);
scroll_text = drop_text;
nscroll_texts = sizeof (drop_text) / sizeof (drop_text[0]);

8
app/dialogs/user-install-dialog.c
View File

@ -815,10 +815,10 @@ user_install_dialog_create (Gimp *gimp)
gtk_widget_set_usize (ctree, -1, ctree->requisition.height);
gdk_pixmap_unref (file_pixmap);
gdk_bitmap_unref (file_mask);
gdk_pixmap_unref (folder_pixmap);
gdk_bitmap_unref (folder_mask);
gdk_drawable_unref (file_pixmap);
gdk_drawable_unref (file_mask);
gdk_drawable_unref (folder_pixmap);
gdk_drawable_unref (folder_mask);
}
/* Page 3 */

4
app/display/gimpdisplay.c
View File

@ -479,8 +479,8 @@ gdisplay_delete (GDisplay *gdisp)
if (gdisp->icon_idle_id)
g_source_remove (gdisp->icon_idle_id);
gdk_pixmap_unref (gdisp->icon);
gdk_pixmap_unref (gdisp->iconmask);
gdk_drawable_unref (gdisp->icon);
gdk_drawable_unref (gdisp->iconmask);
gtk_widget_unref (gdisp->shell);

4
app/gdisplay.c
View File

@ -479,8 +479,8 @@ gdisplay_delete (GDisplay *gdisp)
if (gdisp->icon_idle_id)
g_source_remove (gdisp->icon_idle_id);
gdk_pixmap_unref (gdisp->icon);
gdk_pixmap_unref (gdisp->iconmask);
gdk_drawable_unref (gdisp->icon);
gdk_drawable_unref (gdisp->iconmask);
gtk_widget_unref (gdisp->shell);

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

@ -600,8 +600,8 @@ about_dialog_tool_drop (GtkWidget *widget,
gdk_gc_set_clip_origin (logo_area->style->black_gc, 0, 0);
}
gdk_pixmap_unref (pixmap);
gdk_bitmap_unref (mask);
gdk_drawable_unref (pixmap);
gdk_drawable_unref (mask);
scroll_text = drop_text;
nscroll_texts = sizeof (drop_text) / sizeof (drop_text[0]);

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

@ -374,8 +374,8 @@ color_area_events (GtkWidget *widget,
case GDK_CONFIGURE:
if (color_area_pixmap)
{
gdk_pixmap_unref (color_area_pixmap);
gdk_bitmap_unref (color_area_mask);
gdk_drawable_unref (color_area_pixmap);
gdk_drawable_unref (color_area_mask);
}
color_area_pixmap = gdk_pixmap_new (widget->window,

2
app/gui/device-status-dialog.c
View File

@ -283,7 +283,7 @@ devices_init (void)
device_info->num_axes = device->num_axes;
device_info->axes = NULL;
device_info->num_keys = device->num_axes;
device_info->num_keys = device->num_keys;
device_info->keys = NULL;
device_info->context = gimp_create_context (the_gimp,

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

@ -2160,7 +2160,7 @@ control_update (GradientEditor *gradient_editor,
(cheight != pheight))
{
if (gradient_editor->control_pixmap)
gdk_pixmap_unref (gradient_editor->control_pixmap);
gdk_drawable_unref (gradient_editor->control_pixmap);
gradient_editor->control_pixmap =
gdk_pixmap_new (gradient_editor->control->window, cwidth, cheight, -1);

4
app/gui/gui.c
View File

@ -413,8 +413,8 @@ gui_rotate_the_shield_harmonics (GtkWidget *widget,
gdk_gc_set_clip_origin (widget->style->black_gc, 0, 0);
}
gdk_pixmap_unref (pixmap);
gdk_bitmap_unref (mask);
gdk_drawable_unref (pixmap);
gdk_drawable_unref (mask);
return FALSE;
}

2
app/gui/input-dialog.c
View File

@ -283,7 +283,7 @@ devices_init (void)
device_info->num_axes = device->num_axes;
device_info->axes = NULL;
device_info->num_keys = device->num_axes;
device_info->num_keys = device->num_keys;
device_info->keys = NULL;
device_info->context = gimp_create_context (the_gimp,

2
app/gui/paths-dialog.c
View File

@ -399,7 +399,7 @@ clear_pathwidget (gpointer data)
if (pwidget)
{
if (pwidget->paths_pixmap)
gdk_pixmap_unref (pwidget->paths_pixmap);
gdk_drawable_unref (pwidget->paths_pixmap);
g_free (pwidget);
}

2
app/gui/splash.c
View File

@ -150,7 +150,7 @@ splash_destroy (void)
{
gtk_widget_destroy (win_initstatus);
if (logo_pixmap != NULL)
gdk_pixmap_unref (logo_pixmap);
gdk_drawable_unref (logo_pixmap);
win_initstatus = label1 = label2 = pbar = logo_area = NULL;
logo_pixmap = NULL;

8
app/gui/user-install-dialog.c
View File

@ -815,10 +815,10 @@ user_install_dialog_create (Gimp *gimp)
gtk_widget_set_usize (ctree, -1, ctree->requisition.height);
gdk_pixmap_unref (file_pixmap);
gdk_bitmap_unref (file_mask);
gdk_pixmap_unref (folder_pixmap);
gdk_bitmap_unref (folder_mask);
gdk_drawable_unref (file_pixmap);
gdk_drawable_unref (file_mask);
gdk_drawable_unref (folder_pixmap);
gdk_drawable_unref (folder_mask);
}
/* Page 3 */

6
app/paint/gimpink.c
View File

@ -519,7 +519,7 @@ ink_options_new (void)
blob_ellipse);
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gdk_drawable_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button = gtk_radio_button_new (NULL);
@ -538,7 +538,7 @@ ink_options_new (void)
blob_square);
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gdk_drawable_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button =
@ -558,7 +558,7 @@ ink_options_new (void)
blob_diamond);
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gdk_drawable_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button =

2
app/tools/gimpcurvestool.c
View File

@ -624,7 +624,7 @@ curves_free (void)
}
if (curves_dialog->pixmap)
gdk_pixmap_unref (curves_dialog->pixmap);
gdk_drawable_unref (curves_dialog->pixmap);
gtk_widget_destroy (curves_dialog->shell);
}

6
app/tools/gimpinktool.c
View File

@ -519,7 +519,7 @@ ink_options_new (void)
blob_ellipse);
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gdk_drawable_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button = gtk_radio_button_new (NULL);
@ -538,7 +538,7 @@ ink_options_new (void)
blob_square);
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gdk_drawable_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button =
@ -558,7 +558,7 @@ ink_options_new (void)
blob_diamond);
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gdk_drawable_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button =

2
app/tools/gimptexttool.c
View File

@ -894,7 +894,7 @@ text_render (GimpImage *gimage,
}
/* free the pixmap */
gdk_pixmap_unref (pixmap);
gdk_drawable_unref (pixmap);
/* free the gc */
gdk_gc_destroy (gc);

62
app/undo_history.c
View File

@ -390,7 +390,7 @@ undo_history_set_pixmap_idle (gpointer data)
gtk_clist_set_row_data (idle->clist, idle->row, (gpointer)2);
gtk_clist_set_pixmap (idle->clist, idle->row, 0, pixmap, NULL);
gdk_pixmap_unref (pixmap);
gdk_drawable_unref (pixmap);
return (FALSE);
}
@ -466,7 +466,9 @@ undo_history_shell_destroy_callback (GtkWidget *widget,
undo_history_st *st = data;
if (st->gimage)
gtk_signal_disconnect_by_data (GTK_OBJECT (st->gimage), st);
g_signal_handlers_disconnect_matched (G_OBJECT (st->gimage),
G_SIGNAL_MATCH_DATA,
0, 0, NULL, NULL, st);
g_free (st);
}
@ -636,8 +638,8 @@ undo_history_select_row_callback (GtkWidget *widget,
/* Disable undo_event signals while we do these multiple undo or
* redo actions. */
gtk_signal_handler_block_by_func (GTK_OBJECT (st->gimage),
undo_history_undo_event, st);
g_signal_handlers_block_by_func (G_OBJECT (st->gimage),
undo_history_undo_event, st);
while (cur_selection < st->old_selection)
{
@ -656,8 +658,8 @@ undo_history_select_row_callback (GtkWidget *widget,
if (st->gimage->dirty == 0)
gtk_clist_set_pixmap (GTK_CLIST (widget), cur_selection, 1, clean_pixmap, clean_mask);
gtk_signal_handler_unblock_by_func (GTK_OBJECT (st->gimage),
undo_history_undo_event, st);
g_signal_handlers_unblock_by_func (G_OBJECT (st->gimage),
undo_history_undo_event, st);
undo_history_set_sensitive (st, GTK_CLIST(st->clist)->rows);
}
@ -749,18 +751,18 @@ undo_history_new (GimpImage *gimage)
st->preview_size = gimprc.preview_size;
/* gimage signals */
gtk_signal_connect (GTK_OBJECT (gimage), "undo_event",
GTK_SIGNAL_FUNC (undo_history_undo_event),
st);
gtk_signal_connect (GTK_OBJECT (gimage), "name_changed",
GTK_SIGNAL_FUNC (undo_history_gimage_rename_callback),
st);
gtk_signal_connect (GTK_OBJECT (gimage), "destroy",
GTK_SIGNAL_FUNC (undo_history_gimage_destroy_callback),
st);
gtk_signal_connect (GTK_OBJECT (gimage), "clean",
GTK_SIGNAL_FUNC (undo_history_clean_callback),
st);
g_signal_connect (G_OBJECT (gimage), "undo_event",
G_CALLBACK (undo_history_undo_event),
st);
g_signal_connect (G_OBJECT (gimage), "name_changed",
G_CALLBACK (undo_history_gimage_rename_callback),
st);
g_signal_connect (G_OBJECT (gimage), "destroy",
G_CALLBACK (undo_history_gimage_destroy_callback),
st);
g_signal_connect (G_OBJECT (gimage), "clean",
G_CALLBACK (undo_history_clean_callback),
st);
/* The shell and main vbox */
{
@ -784,9 +786,9 @@ undo_history_new (GimpImage *gimage)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (st->shell)->vbox), vbox);
gtk_widget_show (vbox);
gtk_signal_connect (GTK_OBJECT (st->shell), "destroy",
GTK_SIGNAL_FUNC (undo_history_shell_destroy_callback),
st);
g_signal_connect (G_OBJECT (st->shell), "destroy",
G_CALLBACK (undo_history_shell_destroy_callback),
st);
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_usize (GTK_WIDGET (scrolled_win),
@ -836,9 +838,9 @@ undo_history_new (GimpImage *gimage)
undo_history_set_pixmap (GTK_CLIST (st->clist),
st->old_selection, st->preview_size, st->gimage);
gtk_signal_connect (GTK_OBJECT (st->clist), "select_row",
GTK_SIGNAL_FUNC (undo_history_select_row_callback),
st);
g_signal_connect (G_OBJECT (st->clist), "select_row",
G_CALLBACK (undo_history_select_row_callback),
st);
/* if the image is clean, set the clean pixmap */
if (st->gimage->dirty == 0)
@ -860,16 +862,16 @@ undo_history_new (GimpImage *gimage)
st->undo_button = button = gimp_pixmap_button_new (raise_xpm, _("Undo"));
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (undo_history_undo_callback),
st);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (undo_history_undo_callback),
st);
gtk_widget_show (GTK_WIDGET (button));
st->redo_button = button = gimp_pixmap_button_new (lower_xpm, _("Redo"));
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (undo_history_redo_callback),
st);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (undo_history_redo_callback),
st);
gtk_widget_show (GTK_WIDGET (button));
undo_history_set_sensitive (st, GTK_CLIST (st->clist)->rows);

8
app/user_install.c
View File

@ -815,10 +815,10 @@ user_install_dialog_create (Gimp *gimp)
gtk_widget_set_usize (ctree, -1, ctree->requisition.height);
gdk_pixmap_unref (file_pixmap);
gdk_bitmap_unref (file_mask);
gdk_pixmap_unref (folder_pixmap);
gdk_bitmap_unref (folder_mask);
gdk_drawable_unref (file_pixmap);
gdk_drawable_unref (file_mask);
gdk_drawable_unref (folder_pixmap);
gdk_drawable_unref (folder_mask);
}
/* Page 3 */

2
app/widgets/gimpdeviceinfo.c
View File

@ -283,7 +283,7 @@ devices_init (void)
device_info->num_axes = device->num_axes;
device_info->axes = NULL;
device_info->num_keys = device->num_axes;
device_info->num_keys = device->num_keys;
device_info->keys = NULL;
device_info->context = gimp_create_context (the_gimp,

2
app/widgets/gimpdevices.c
View File

@ -283,7 +283,7 @@ devices_init (void)
device_info->num_axes = device->num_axes;
device_info->axes = NULL;
device_info->num_keys = device->num_axes;
device_info->num_keys = device->num_keys;
device_info->keys = NULL;
device_info->context = gimp_create_context (the_gimp,

2
app/widgets/gimpgradienteditor.c
View File

@ -2160,7 +2160,7 @@ control_update (GradientEditor *gradient_editor,
(cheight != pheight))
{
if (gradient_editor->control_pixmap)
gdk_pixmap_unref (gradient_editor->control_pixmap);
gdk_drawable_unref (gradient_editor->control_pixmap);
gradient_editor->control_pixmap =
gdk_pixmap_new (gradient_editor->control->window, cwidth, cheight, -1);

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

@ -374,8 +374,8 @@ color_area_events (GtkWidget *widget,
case GDK_CONFIGURE:
if (color_area_pixmap)
{
gdk_pixmap_unref (color_area_pixmap);
gdk_bitmap_unref (color_area_mask);
gdk_drawable_unref (color_area_pixmap);
gdk_drawable_unref (color_area_mask);
}
color_area_pixmap = gdk_pixmap_new (widget->window,

10
app/xcf/xcf-load.c
View File

@ -361,7 +361,7 @@ xcf_load_image (Gimp *gimp,
g_message ("XCF: This file is corrupt! I could not even\n"
"salvage any partial image data from it.");
gtk_object_unref (GTK_OBJECT (gimage));
g_object_unref (G_OBJECT (gimage));
return NULL;
}
@ -745,7 +745,7 @@ xcf_load_channel_props (XcfInfo *info,
info->active_channel = channel;
break;
case PROP_SELECTION:
gtk_object_unref (GTK_OBJECT (gimage->selection_mask));
g_object_unref (G_OBJECT (gimage->selection_mask));
gimage->selection_mask = channel;
channel->boundary_known = FALSE;
channel->bounds_known = FALSE;
@ -912,7 +912,7 @@ xcf_load_layer (XcfInfo *info,
return layer;
error:
gtk_object_unref (GTK_OBJECT (layer));
g_object_unref (G_OBJECT (layer));
return NULL;
}
@ -969,7 +969,7 @@ xcf_load_channel (XcfInfo *info,
return channel;
error:
gtk_object_unref (GTK_OBJECT (channel));
g_object_unref (G_OBJECT (channel));
return NULL;
}
@ -1026,7 +1026,7 @@ xcf_load_layer_mask (XcfInfo *info,
return layer_mask;
error:
gtk_object_unref (GTK_OBJECT (layer_mask));
g_object_unref (G_OBJECT (layer_mask));
return NULL;
}

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

@ -114,10 +114,15 @@
#include <ctype.h>
#include <gtk/gtk.h>
#ifndef GDK_WINDOWING_WIN32
#if defined (GDK_WINDOWING_X11)
#include <gdk/gdkx.h>
#else
#include <gdk/win32/gdkwin32.h>
#elif defined (GDK_WINDOWING_WIN32)
#include <gdk/gdkwin32.h>
#elif defined (GDK_WINDOWING_DIRECTFB)
#include <gdk/gdkdirectfb.h>
#elif defined (GDK_WINDOWING_FB)
#include <gdk/gdkfb.h>
#endif
#include <libgimp/gimp.h>