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

more places with Solaris compilation problems

Browse Source 
--Sven
This commit is contained in:
Sven Neumann
2000-02-21 12:05:45 +00:00
parent 0a5fadee17
commit e836901c83
7 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Mon Feb 21 13:04:47 CET 2000 Sven Neumann <sven@gimp.org>
* app/blend.c
* plug-ins/Lighting/lighting_ui.c
* plug-ins/MapObject/mapobject_ui.c: more places that had the same
Solaris compilation problems
2000-02-21 Michael Natterer <mitch@gimp.org> 2000-02-21 Michael Natterer <mitch@gimp.org>
* app/perspective_tool.c * app/perspective_tool.c

3
app/blend.c
View File

@ -521,7 +521,8 @@ blend_button_release (Tool *tool,
blend_tool->starty, blend_tool->starty,
blend_tool->endx, blend_tool->endx,
blend_tool->endy, blend_tool->endy,
progress? progress_update_and_flush : NULL, progress); progress ? progress_update_and_flush : (progress_func_t)NULL,
progress);
if (progress) if (progress)
progress_end (progress); progress_end (progress);

3
app/core/gimpdrawable-blend.c
View File

@ -521,7 +521,8 @@ blend_button_release (Tool *tool,
blend_tool->starty, blend_tool->starty,
blend_tool->endx, blend_tool->endx,
blend_tool->endy, blend_tool->endy,
progress? progress_update_and_flush : NULL, progress); progress ? progress_update_and_flush : (progress_func_t)NULL,
progress);
if (progress) if (progress)
progress_end (progress); progress_end (progress);

3
app/tools/blend.c
View File

@ -521,7 +521,8 @@ blend_button_release (Tool *tool,
blend_tool->starty, blend_tool->starty,
blend_tool->endx, blend_tool->endx,
blend_tool->endy, blend_tool->endy,
progress? progress_update_and_flush : NULL, progress); progress ? progress_update_and_flush : (progress_func_t)NULL,
progress);
if (progress) if (progress)
progress_end (progress); progress_end (progress);

3
app/tools/gimpblendtool.c
View File

@ -521,7 +521,8 @@ blend_button_release (Tool *tool,
blend_tool->starty, blend_tool->starty,
blend_tool->endx, blend_tool->endx,
blend_tool->endy, blend_tool->endy,
progress? progress_update_and_flush : NULL, progress); progress ? progress_update_and_flush : (progress_func_t)NULL,
progress);
if (progress) if (progress)
progress_end (progress); progress_end (progress);

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

@ -608,7 +608,7 @@ create_light_page (void)
gtk_widget_show (table); gtk_widget_show (table);
spinbutton = gimp_spin_button_new (&adj, mapvals.lightsource.position.x, spinbutton = gimp_spin_button_new (&adj, mapvals.lightsource.position.x,
-G_MAXDOUBLE, G_MAXDOUBLE, -G_MAXFLOAT, G_MAXFLOAT,
0.1, 1.0, 1.0, 0.0, 2); 0.1, 1.0, 1.0, 0.0, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("X:"), 1.0, 0.5, _("X:"), 1.0, 0.5,
@ -621,7 +621,7 @@ create_light_page (void)
_("Light source X position in XYZ space"), NULL); _("Light source X position in XYZ space"), NULL);
spinbutton = gimp_spin_button_new (&adj, mapvals.lightsource.position.y, spinbutton = gimp_spin_button_new (&adj, mapvals.lightsource.position.y,
-G_MAXDOUBLE, G_MAXDOUBLE, -G_MAXFLOAT, G_MAXFLOAT,
0.1, 1.0, 1.0, 0.0, 2); 0.1, 1.0, 1.0, 0.0, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Y:"), 1.0, 0.5, _("Y:"), 1.0, 0.5,
@ -634,7 +634,7 @@ create_light_page (void)
_("Light source Y position in XYZ space"), NULL); _("Light source Y position in XYZ space"), NULL);
spinbutton = gimp_spin_button_new (&adj, mapvals.lightsource.position.z, spinbutton = gimp_spin_button_new (&adj, mapvals.lightsource.position.z,
-G_MAXDOUBLE, G_MAXDOUBLE, -G_MAXFLOAT, G_MAXFLOAT,
0.1, 1.0, 1.0, 0.0, 2); 0.1, 1.0, 1.0, 0.0, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Z:"), 1.0, 0.5, _("Z:"), 1.0, 0.5,
@ -741,7 +741,7 @@ create_material_page (void)
pixmap, 1, FALSE); pixmap, 1, FALSE);
spinbutton = gimp_spin_button_new (&adj, mapvals.material.ambient_int, spinbutton = gimp_spin_button_new (&adj, mapvals.material.ambient_int,
0, G_MAXDOUBLE, 0.1, 1.0, 1.0, 0.0, 2); 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2);
gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 0, 1, gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed", gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
@ -766,7 +766,7 @@ create_material_page (void)
pixmap, 1, FALSE); pixmap, 1, FALSE);
spinbutton = gimp_spin_button_new (&adj, mapvals.material.diffuse_int, spinbutton = gimp_spin_button_new (&adj, mapvals.material.diffuse_int,
0, G_MAXDOUBLE, 0.1, 1.0, 1.0, 0.0, 2); 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2);
gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 1, 2, gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed", gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
@ -805,7 +805,7 @@ create_material_page (void)
pixmap, 1, FALSE); pixmap, 1, FALSE);
spinbutton = gimp_spin_button_new (&adj, mapvals.material.diffuse_ref, spinbutton = gimp_spin_button_new (&adj, mapvals.material.diffuse_ref,
0, G_MAXDOUBLE, 0.1, 1.0, 1.0, 0.0, 2); 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2);
gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 0, 1, gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed", gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
@ -830,7 +830,7 @@ create_material_page (void)
pixmap, 1, FALSE); pixmap, 1, FALSE);
spinbutton = gimp_spin_button_new (&adj, mapvals.material.specular_ref, spinbutton = gimp_spin_button_new (&adj, mapvals.material.specular_ref,
0, G_MAXDOUBLE, 0.1, 1.0, 1.0, 0.0, 2); 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2);
gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 1, 2, gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed", gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
@ -855,7 +855,7 @@ create_material_page (void)
pixmap, 1, FALSE); pixmap, 1, FALSE);
spinbutton = gimp_spin_button_new (&adj, mapvals.material.highlight, spinbutton = gimp_spin_button_new (&adj, mapvals.material.highlight,
0, G_MAXDOUBLE, 0.1, 1.0, 1.0, 0.0, 2); 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2);
gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 2, 3, gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 2, 3,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed", gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
@ -927,7 +927,7 @@ create_bump_page (void)
optionmenu, 1, TRUE); optionmenu, 1, TRUE);
spinbutton = gimp_spin_button_new (&adj, mapvals.bumpmin, spinbutton = gimp_spin_button_new (&adj, mapvals.bumpmin,
0, G_MAXDOUBLE, 0.01, 0.1, 1.0, 0.0, 2); 0, G_MAXFLOAT, 0.01, 0.1, 1.0, 0.0, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Minimum Height:"), 1.0, 0.5, _("Minimum Height:"), 1.0, 0.5,
spinbutton, 1, TRUE); spinbutton, 1, TRUE);
@ -936,7 +936,7 @@ create_bump_page (void)
&mapvals.bumpmin); &mapvals.bumpmin);
spinbutton = gimp_spin_button_new (&adj, mapvals.bumpmax, spinbutton = gimp_spin_button_new (&adj, mapvals.bumpmax,
0, G_MAXDOUBLE, 0.01, 0.1, 1.0, 0.0, 2); 0, G_MAXFLOAT, 0.01, 0.1, 1.0, 0.0, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Maximum Height:"), 1.0, 0.5, _("Maximum Height:"), 1.0, 0.5,
spinbutton, 1, TRUE); spinbutton, 1, TRUE);

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

@ -741,7 +741,7 @@ create_light_page (void)
gtk_widget_show (table); gtk_widget_show (table);
spinbutton = gimp_spin_button_new (&xadj, mapvals.lightsource.position.x, spinbutton = gimp_spin_button_new (&xadj, mapvals.lightsource.position.x,
-G_MAXDOUBLE, G_MAXDOUBLE, -G_MAXFLOAT, G_MAXFLOAT,
0.1, 1.0, 1.0, 0.0, 2); 0.1, 1.0, 1.0, 0.0, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("X:"), 1.0, 0.5, _("X:"), 1.0, 0.5,
@ -754,7 +754,7 @@ create_light_page (void)
_("Light source X position in XYZ space"), NULL); _("Light source X position in XYZ space"), NULL);
spinbutton = gimp_spin_button_new (&yadj, mapvals.lightsource.position.y, spinbutton = gimp_spin_button_new (&yadj, mapvals.lightsource.position.y,
-G_MAXDOUBLE, G_MAXDOUBLE, -G_MAXFLOAT, G_MAXFLOAT,
0.1, 1.0, 1.0, 0.0, 2); 0.1, 1.0, 1.0, 0.0, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Y:"), 1.0, 0.5, _("Y:"), 1.0, 0.5,
@ -767,7 +767,7 @@ create_light_page (void)
_("Light source Y position in XYZ space"), NULL); _("Light source Y position in XYZ space"), NULL);
spinbutton = gimp_spin_button_new (&zadj, mapvals.lightsource.position.z, spinbutton = gimp_spin_button_new (&zadj, mapvals.lightsource.position.z,
-G_MAXDOUBLE, G_MAXDOUBLE, -G_MAXFLOAT, G_MAXFLOAT,
0.1, 1.0, 1.0, 0.0, 2); 0.1, 1.0, 1.0, 0.0, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Z:"), 1.0, 0.5, _("Z:"), 1.0, 0.5,
@ -874,7 +874,7 @@ create_material_page (void)
pixmap, 1, FALSE); pixmap, 1, FALSE);
spinbutton = gimp_spin_button_new (&adj, mapvals.material.ambient_int, spinbutton = gimp_spin_button_new (&adj, mapvals.material.ambient_int,
0, G_MAXDOUBLE, 0.1, 1.0, 1.0, 0.0, 2); 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2);
gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 0, 1, gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed", gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
@ -899,7 +899,7 @@ create_material_page (void)
pixmap, 1, FALSE); pixmap, 1, FALSE);
spinbutton = gimp_spin_button_new (&adj, mapvals.material.diffuse_int, spinbutton = gimp_spin_button_new (&adj, mapvals.material.diffuse_int,
0, G_MAXDOUBLE, 0.1, 1.0, 1.0, 0.0, 2); 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2);
gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 1, 2, gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed", gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
@ -938,7 +938,7 @@ create_material_page (void)
pixmap, 1, FALSE); pixmap, 1, FALSE);
spinbutton = gimp_spin_button_new (&adj, mapvals.material.diffuse_ref, spinbutton = gimp_spin_button_new (&adj, mapvals.material.diffuse_ref,
0, G_MAXDOUBLE, 0.1, 1.0, 1.0, 0.0, 2); 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2);
gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 0, 1, gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed", gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
@ -963,7 +963,7 @@ create_material_page (void)
pixmap, 1, FALSE); pixmap, 1, FALSE);
spinbutton = gimp_spin_button_new (&adj, mapvals.material.specular_ref, spinbutton = gimp_spin_button_new (&adj, mapvals.material.specular_ref,
0, G_MAXDOUBLE, 0.1, 1.0, 1.0, 0.0, 2); 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2);
gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 1, 2, gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed", gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
@ -988,7 +988,7 @@ create_material_page (void)
pixmap, 1, FALSE); pixmap, 1, FALSE);
spinbutton = gimp_spin_button_new (&adj, mapvals.material.highlight, spinbutton = gimp_spin_button_new (&adj, mapvals.material.highlight,
0, G_MAXDOUBLE, 0.1, 1.0, 1.0, 0.0, 2); 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2);
gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 2, 3, gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 2, 3,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed", gtk_signal_connect (GTK_OBJECT (adj), "value_changed",