callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a FIXME: set the sensitivity of the color tools' menu entries again.

Browse Source 
2001-06-14  Michael Natterer  <mitch@gimp.org>

	* app/gdisplay.c: fixed a FIXME: set the sensitivity of the
	color tools' menu entries again.

	* libgimp/gimpcolorselector.h
	* libgimp/gimpdrawable.h
	* libgimp/gimpmenu.h: removed the usage of "id" from the public
	interface because it's a reserved keyword of Objective C.

	* libgimp/gimpdrawable.c
	* libgimp/gimptile.c

	* plug-ins/[lotsa plugins].c: changed accordingly.
This commit is contained in:
Michael Natterer
2001-06-14 20:07:38 +00:00
committed by Michael Natterer
parent 1564c5fd83
commit 593043a1b6
126 changed files with 876 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libgimp/gimpcolorselector.h
View File

@ -92,7 +92,7 @@ gimp_color_selector_register (const gchar *name,
G_MODULE_EXPORT
gboolean
gimp_color_selector_unregister (GimpColorSelectorID id,
gimp_color_selector_unregister (GimpColorSelectorID selector_id,
GimpColorSelectorFinishedCB finished_cb,
gpointer finished_data);

8
libgimp/gimpdrawable.c
View File

@ -38,7 +38,7 @@ gimp_drawable_get (gint32 drawable_ID)
GimpDrawable *drawable;
drawable = g_new (GimpDrawable, 1);
drawable->id = drawable_ID;
drawable->drawable_id = drawable_ID;
drawable->width = gimp_drawable_width (drawable_ID);
drawable->height = gimp_drawable_height (drawable_ID);
drawable->bpp = gimp_drawable_bpp (drawable_ID);
@ -100,10 +100,10 @@ gimp_drawable_delete (GimpDrawable *drawable)
{
if (drawable)
{
if (gimp_drawable_is_layer (drawable->id))
gimp_layer_delete (drawable->id);
if (gimp_drawable_is_layer (drawable->drawable_id))
gimp_layer_delete (drawable->drawable_id);
else
gimp_channel_delete (drawable->id);
gimp_channel_delete (drawable->drawable_id);
}
}

2
libgimp/gimpdrawable.h
View File

@ -34,7 +34,7 @@ extern "C" {
struct _GimpDrawable
{
gint32 id; /* drawable ID */
gint32 drawable_id; /* drawable ID */
guint width; /* width of drawble */
guint height; /* height of drawble */
guint bpp; /* bytes per pixel of drawable */

2
libgimp/gimpmenu.h
View File

@ -30,7 +30,7 @@ extern "C" {
typedef gint (* GimpConstraintFunc) (gint32 image_id,
gint32 drawable_id,
gpointer data);
typedef void (* GimpMenuCallback) (gint32 id,
typedef void (* GimpMenuCallback) (gint32 any_id,
gpointer data);

6
libgimp/gimptile.c
View File

@ -155,7 +155,7 @@ gimp_tile_get (GimpTile *tile)
GPTileData *tile_data;
WireMessage msg;
tile_req.drawable_ID = tile->drawable->id;
tile_req.drawable_ID = tile->drawable->drawable_id;
tile_req.tile_num = tile->tile_num;
tile_req.shadow = tile->shadow;
if (!gp_tile_req_write (_writechannel, &tile_req))
@ -164,7 +164,7 @@ gimp_tile_get (GimpTile *tile)
gimp_read_expect_msg(&msg,GP_TILE_DATA);
tile_data = msg.data;
if ((tile_data->drawable_ID != tile->drawable->id) ||
if ((tile_data->drawable_ID != tile->drawable->drawable_id) ||
(tile_data->tile_num != tile->tile_num) ||
(tile_data->shadow != tile->shadow) ||
(tile_data->width != tile->ewidth) ||
@ -213,7 +213,7 @@ gimp_tile_put (GimpTile *tile)
tile_info = msg.data;
tile_data.drawable_ID = tile->drawable->id;
tile_data.drawable_ID = tile->drawable->drawable_id;
tile_data.tile_num = tile->tile_num;
tile_data.shadow = tile->shadow;
tile_data.bpp = tile->bpp;