graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-19 22:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

close bugs #3910 and #3911

Browse source 
--Sven
This commit is contained in:
Sven Neumann 1999-11-30 00:58:38 +00:00
parent 1fdea67422
commit ad11737983
7 changed files with 177 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Tue Nov 30 01:55:43 MET 1999 Sven Neumann <sven@gimp.org>
* app/menus.c: make it compile with strict ANSI C compilers
* app/xinput_airbrush.c: move return_type out of #ifdef
Closes bugs #3910 and #3911
Tue Nov 30 01:17:12 MET 1999 Sven Neumann <sven@gimp.org>
* app/gimpimage.c: correctly save the layer mode to the undo_stack

74
app/gui/menus.c
View file

@ -941,10 +941,13 @@ menus_create_item_from_full_path (GimpItemFactoryEntry *entry,
tearoff_path->str))
{
GimpItemFactoryEntry tearoff_entry =
{ { tearoff_path->str, NULL, tearoff_cmd_callback, 0,
"<Tearoff>" },
NULL, NULL };
{
{ NULL, NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
NULL,
NULL
};
tearoff_entry.entry.path = tearoff_path->str;
menus_create_item (item_factory, &tearoff_entry, NULL, 2);
}
@ -1511,10 +1514,13 @@ menus_create_items (GtkItemFactory *item_factory,
{
GimpItemFactoryEntry tearoff_entry =
{ { tearoff_path, NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
NULL, NULL
{
{ NULL, NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
NULL,
NULL
};
tearoff_entry.entry.path = tearoff_path;
menus_create_item (item_factory, &tearoff_entry, NULL, 2);
}
@ -1771,35 +1777,39 @@ help_debug_cmd_callback (GtkWidget *widget,
gpointer callback_data,
guint callback_action)
{
GtkItemFactory *factories[] = { toolbox_factory,
image_factory,
layers_factory,
channels_factory,
paths_factory,
load_factory,
save_factory };
gint n_factories = (sizeof (factories) /
sizeof (factories[0]));
GimpItemFactoryEntry *entries[] = { toolbox_entries,
image_entries,
layers_entries,
channels_entries,
paths_entries,
load_entries,
save_entries };
gint num_entries[] = { n_toolbox_entries,
n_image_entries,
n_layers_entries,
n_channels_entries,
n_paths_entries,
n_load_entries,
n_save_entries };
/* ugly, but ANSI C compliant */
gint n_factories = 7;
GtkItemFactory *factories[7];
GimpItemFactoryEntry *entries[7];
gint num_entries[7];
gchar *help_path;
gint i, j;
factories[0] = toolbox_factory;
factories[1] = image_factory;
factories[2] = layers_factory;
factories[3] = channels_factory;
factories[4] = paths_factory;
factories[5] = load_factory;
factories[6] = save_factory;
entries[0] = toolbox_entries;
entries[1] = image_entries;
entries[2] = layers_entries;
entries[3] = channels_entries;
entries[4] = paths_entries;
entries[5] = load_entries;
entries[6] = save_entries;
num_entries[0] = n_toolbox_entries;
num_entries[1] = n_image_entries;
num_entries[2] = n_layers_entries;
num_entries[3] = n_channels_entries;
num_entries[4] = n_paths_entries;
num_entries[5] = n_load_entries;
num_entries[6] = n_save_entries;
for (i = 0; i < n_factories; i++)
{
help_path = gtk_object_get_data (GTK_OBJECT (factories[i]), "help_path");

74
app/menus.c
View file

@ -941,10 +941,13 @@ menus_create_item_from_full_path (GimpItemFactoryEntry *entry,
tearoff_path->str))
{
GimpItemFactoryEntry tearoff_entry =
{ { tearoff_path->str, NULL, tearoff_cmd_callback, 0,
"<Tearoff>" },
NULL, NULL };
{
{ NULL, NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
NULL,
NULL
};
tearoff_entry.entry.path = tearoff_path->str;
menus_create_item (item_factory, &tearoff_entry, NULL, 2);
}
@ -1511,10 +1514,13 @@ menus_create_items (GtkItemFactory *item_factory,
{
GimpItemFactoryEntry tearoff_entry =
{ { tearoff_path, NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
NULL, NULL
{
{ NULL, NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
NULL,
NULL
};
tearoff_entry.entry.path = tearoff_path;
menus_create_item (item_factory, &tearoff_entry, NULL, 2);
}
@ -1771,35 +1777,39 @@ help_debug_cmd_callback (GtkWidget *widget,
gpointer callback_data,
guint callback_action)
{
GtkItemFactory *factories[] = { toolbox_factory,
image_factory,
layers_factory,
channels_factory,
paths_factory,
load_factory,
save_factory };
gint n_factories = (sizeof (factories) /
sizeof (factories[0]));
GimpItemFactoryEntry *entries[] = { toolbox_entries,
image_entries,
layers_entries,
channels_entries,
paths_entries,
load_entries,
save_entries };
gint num_entries[] = { n_toolbox_entries,
n_image_entries,
n_layers_entries,
n_channels_entries,
n_paths_entries,
n_load_entries,
n_save_entries };
/* ugly, but ANSI C compliant */
gint n_factories = 7;
GtkItemFactory *factories[7];
GimpItemFactoryEntry *entries[7];
gint num_entries[7];
gchar *help_path;
gint i, j;
factories[0] = toolbox_factory;
factories[1] = image_factory;
factories[2] = layers_factory;
factories[3] = channels_factory;
factories[4] = paths_factory;
factories[5] = load_factory;
factories[6] = save_factory;
entries[0] = toolbox_entries;
entries[1] = image_entries;
entries[2] = layers_entries;
entries[3] = channels_entries;
entries[4] = paths_entries;
entries[5] = load_entries;
entries[6] = save_entries;
num_entries[0] = n_toolbox_entries;
num_entries[1] = n_image_entries;
num_entries[2] = n_layers_entries;
num_entries[3] = n_channels_entries;
num_entries[4] = n_paths_entries;
num_entries[5] = n_load_entries;
num_entries[6] = n_save_entries;
for (i = 0; i < n_factories; i++)
{
help_path = gtk_object_get_data (GTK_OBJECT (factories[i]), "help_path");

74
app/menus/menus.c
View file

@ -941,10 +941,13 @@ menus_create_item_from_full_path (GimpItemFactoryEntry *entry,
tearoff_path->str))
{
GimpItemFactoryEntry tearoff_entry =
{ { tearoff_path->str, NULL, tearoff_cmd_callback, 0,
"<Tearoff>" },
NULL, NULL };
{
{ NULL, NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
NULL,
NULL
};
tearoff_entry.entry.path = tearoff_path->str;
menus_create_item (item_factory, &tearoff_entry, NULL, 2);
}
@ -1511,10 +1514,13 @@ menus_create_items (GtkItemFactory *item_factory,
{
GimpItemFactoryEntry tearoff_entry =
{ { tearoff_path, NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
NULL, NULL
{
{ NULL, NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
NULL,
NULL
};
tearoff_entry.entry.path = tearoff_path;
menus_create_item (item_factory, &tearoff_entry, NULL, 2);
}
@ -1771,35 +1777,39 @@ help_debug_cmd_callback (GtkWidget *widget,
gpointer callback_data,
guint callback_action)
{
GtkItemFactory *factories[] = { toolbox_factory,
image_factory,
layers_factory,
channels_factory,
paths_factory,
load_factory,
save_factory };
gint n_factories = (sizeof (factories) /
sizeof (factories[0]));
GimpItemFactoryEntry *entries[] = { toolbox_entries,
image_entries,
layers_entries,
channels_entries,
paths_entries,
load_entries,
save_entries };
gint num_entries[] = { n_toolbox_entries,
n_image_entries,
n_layers_entries,
n_channels_entries,
n_paths_entries,
n_load_entries,
n_save_entries };
/* ugly, but ANSI C compliant */
gint n_factories = 7;
GtkItemFactory *factories[7];
GimpItemFactoryEntry *entries[7];
gint num_entries[7];
gchar *help_path;
gint i, j;
factories[0] = toolbox_factory;
factories[1] = image_factory;
factories[2] = layers_factory;
factories[3] = channels_factory;
factories[4] = paths_factory;
factories[5] = load_factory;
factories[6] = save_factory;
entries[0] = toolbox_entries;
entries[1] = image_entries;
entries[2] = layers_entries;
entries[3] = channels_entries;
entries[4] = paths_entries;
entries[5] = load_entries;
entries[6] = save_entries;
num_entries[0] = n_toolbox_entries;
num_entries[1] = n_image_entries;
num_entries[2] = n_layers_entries;
num_entries[3] = n_channels_entries;
num_entries[4] = n_paths_entries;
num_entries[5] = n_load_entries;
num_entries[6] = n_save_entries;
for (i = 0; i < n_factories; i++)
{
help_path = gtk_object_get_data (GTK_OBJECT (factories[i]), "help_path");

2
app/tools/xinput_airbrush.c
View file

@ -502,8 +502,8 @@ static XinputAirbrushOptions *
}
#ifdef GTK_HAVE_SIX_VALUATORS
static AirBlob *
#ifdef GTK_HAVE_SIX_VALUATORS
xinput_airbrush_pen_ellipse (XinputAirbrushTool *xinput_airbrush_tool,
gdouble x_center, gdouble y_center,
gdouble pressure, gdouble xtiltv,

74
app/widgets/gimpitemfactory.c
View file

@ -941,10 +941,13 @@ menus_create_item_from_full_path (GimpItemFactoryEntry *entry,
tearoff_path->str))
{
GimpItemFactoryEntry tearoff_entry =
{ { tearoff_path->str, NULL, tearoff_cmd_callback, 0,
"<Tearoff>" },
NULL, NULL };
{
{ NULL, NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
NULL,
NULL
};
tearoff_entry.entry.path = tearoff_path->str;
menus_create_item (item_factory, &tearoff_entry, NULL, 2);
}
@ -1511,10 +1514,13 @@ menus_create_items (GtkItemFactory *item_factory,
{
GimpItemFactoryEntry tearoff_entry =
{ { tearoff_path, NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
NULL, NULL
{
{ NULL, NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
NULL,
NULL
};
tearoff_entry.entry.path = tearoff_path;
menus_create_item (item_factory, &tearoff_entry, NULL, 2);
}
@ -1771,35 +1777,39 @@ help_debug_cmd_callback (GtkWidget *widget,
gpointer callback_data,
guint callback_action)
{
GtkItemFactory *factories[] = { toolbox_factory,
image_factory,
layers_factory,
channels_factory,
paths_factory,
load_factory,
save_factory };
gint n_factories = (sizeof (factories) /
sizeof (factories[0]));
GimpItemFactoryEntry *entries[] = { toolbox_entries,
image_entries,
layers_entries,
channels_entries,
paths_entries,
load_entries,
save_entries };
gint num_entries[] = { n_toolbox_entries,
n_image_entries,
n_layers_entries,
n_channels_entries,
n_paths_entries,
n_load_entries,
n_save_entries };
/* ugly, but ANSI C compliant */
gint n_factories = 7;
GtkItemFactory *factories[7];
GimpItemFactoryEntry *entries[7];
gint num_entries[7];
gchar *help_path;
gint i, j;
factories[0] = toolbox_factory;
factories[1] = image_factory;
factories[2] = layers_factory;
factories[3] = channels_factory;
factories[4] = paths_factory;
factories[5] = load_factory;
factories[6] = save_factory;
entries[0] = toolbox_entries;
entries[1] = image_entries;
entries[2] = layers_entries;
entries[3] = channels_entries;
entries[4] = paths_entries;
entries[5] = load_entries;
entries[6] = save_entries;
num_entries[0] = n_toolbox_entries;
num_entries[1] = n_image_entries;
num_entries[2] = n_layers_entries;
num_entries[3] = n_channels_entries;
num_entries[4] = n_paths_entries;
num_entries[5] = n_load_entries;
num_entries[6] = n_save_entries;
for (i = 0; i < n_factories; i++)
{
help_path = gtk_object_get_data (GTK_OBJECT (factories[i]), "help_path");

2
app/xinput_airbrush.c
View file

@ -502,8 +502,8 @@ static XinputAirbrushOptions *
}
#ifdef GTK_HAVE_SIX_VALUATORS
static AirBlob *
#ifdef GTK_HAVE_SIX_VALUATORS
xinput_airbrush_pen_ellipse (XinputAirbrushTool *xinput_airbrush_tool,
gdouble x_center, gdouble y_center,
gdouble pressure, gdouble xtiltv,