Commit eb8487b4 authored by Michael Natterer's avatar Michael Natterer 😴

plug-ins: s/GtkObject/GtkAdjustment/g in plug-ins/common/

parent 95cd1aa1
......@@ -614,12 +614,12 @@ align_layers_get_align_offsets (gint32 drawable_id,
static int
align_layers_dialog (void)
{
GtkWidget *dialog;
GtkWidget *table;
GtkWidget *combo;
GtkWidget *toggle;
GtkObject *adj;
gboolean run;
GtkWidget *dialog;
GtkWidget *table;
GtkWidget *combo;
GtkWidget *toggle;
GtkAdjustment *adj;
gboolean run;
gimp_ui_init (PLUG_IN_BINARY, FALSE);
......
......@@ -1323,7 +1323,7 @@ bender_new_dialog (GimpDrawable *drawable)
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
cd->rotate_data = GTK_ADJUSTMENT (gtk_adjustment_new (0, 0.0, 360.0, 1, 45, 0));
cd->rotate_data = gtk_adjustment_new (0, 0.0, 360.0, 1, 45, 0);
gtk_adjustment_set_value (cd->rotate_data, cd->rotation);
spinbutton = gtk_spin_button_new (cd->rotate_data, 0.5, 1);
......
......@@ -847,10 +847,10 @@ size_adjustment_callback (GtkWidget *widget,
newn * *(adj->value) != size);
if (adj->ncells != NULL)
gtk_adjustment_set_value (GTK_ADJUSTMENT (adj->ncells),
gtk_adjustment_set_value (adj->ncells,
*(adj->other_count) * *(adj->count));
if (adj->rank0 != NULL)
gtk_adjustment_set_value (GTK_ADJUSTMENT (adj->rank0),
gtk_adjustment_set_value (adj->rank0,
*(adj->other_count) * *(adj->count));
}
......@@ -940,8 +940,7 @@ gih_save_dialog (gint32 image_ID)
/*
* Spacing: __
*/
adjustment = (GtkAdjustment *) gtk_adjustment_new (info.spacing,
1, 1000, 1, 10, 0);
adjustment = gtk_adjustment_new (info.spacing, 1, 1000, 1, 10, 0);
spinbutton = gtk_spin_button_new (adjustment, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
......@@ -957,9 +956,8 @@ gih_save_dialog (gint32 image_ID)
*/
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
adjustment = (GtkAdjustment *)
gtk_adjustment_new (gihparams.cellwidth,
2, gimp_image_width (image_ID), 1, 10, 0);
adjustment = gtk_adjustment_new (gihparams.cellwidth,
2, gimp_image_width (image_ID), 1, 10, 0);
spinbutton = gtk_spin_button_new (adjustment, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_box_pack_start (GTK_BOX (box), spinbutton, FALSE, FALSE, 0);
......@@ -981,9 +979,8 @@ gih_save_dialog (gint32 image_ID)
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
gtk_widget_show (label);
adjustment = (GtkAdjustment *)
gtk_adjustment_new (gihparams.cellheight,
2, gimp_image_height (image_ID), 1, 10, 0);
adjustment = gtk_adjustment_new (gihparams.cellheight,
2, gimp_image_height (image_ID), 1, 10, 0);
spinbutton = gtk_spin_button_new (adjustment, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_box_pack_start (GTK_BOX (box), spinbutton, FALSE, FALSE, 0);
......@@ -1013,8 +1010,7 @@ gih_save_dialog (gint32 image_ID)
/*
* Number of cells: ___
*/
adjustment = (GtkAdjustment *)
gtk_adjustment_new (gihparams.ncells, 1, 1000, 1, 10, 0);
adjustment = gtk_adjustment_new (gihparams.ncells, 1, 1000, 1, 10, 0);
spinbutton = gtk_spin_button_new (adjustment, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
......@@ -1074,8 +1070,8 @@ gih_save_dialog (gint32 image_ID)
/*
* Dimension: ___
*/
adjustment = (GtkAdjustment *)
gtk_adjustment_new (gihparams.dim, 1, GIMP_PIXPIPE_MAXDIM, 1, 1, 0);
adjustment = gtk_adjustment_new (gihparams.dim,
1, GIMP_PIXPIPE_MAXDIM, 1, 1, 0);
spinbutton = gtk_spin_button_new (adjustment, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 5,
......@@ -1096,8 +1092,7 @@ gih_save_dialog (gint32 image_ID)
{
gint j;
adjustment = (GtkAdjustment *)
gtk_adjustment_new (gihparams.rank[i], 1, 100, 1, 1, 0);
adjustment = gtk_adjustment_new (gihparams.rank[i], 1, 100, 1, 1, 0);
spinbutton = gtk_spin_button_new (adjustment, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_table_attach (GTK_TABLE (dimtable), spinbutton, 0, 1, i, i + 1,
......
......@@ -1809,18 +1809,18 @@ static gboolean
load_dialog (const gchar *filename,
gboolean is_hgt)
{
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *sw;
GtkWidget *viewport;
GtkWidget *frame;
GtkWidget *table;
GtkWidget *combo;
GtkWidget *button;
GtkObject *adj;
goffset file_size;
gboolean run;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *sw;
GtkWidget *viewport;
GtkWidget *frame;
GtkWidget *table;
GtkWidget *combo;
GtkWidget *button;
GtkAdjustment *adj;
goffset file_size;
gboolean run;
file_size = get_file_info (filename);
......
......@@ -1078,8 +1078,7 @@ save_dialog (const gint32 image_ID,
x1 = hotspotRange->x;
x2 = hotspotRange->width + hotspotRange->x - 1;
adjustment = (GtkAdjustment *)
gtk_adjustment_new (xmcparas.x, x1, x2, 1, 5, 0);
adjustment = gtk_adjustment_new (xmcparas.x, x1, x2, 1, 5, 0);
tmpwidget = gtk_spin_button_new (adjustment, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (tmpwidget), TRUE);
g_value_set_double (&val, 1.0);
......@@ -1101,8 +1100,7 @@ save_dialog (const gint32 image_ID,
y1 = hotspotRange->y;
y2 = hotspotRange->height + hotspotRange->y - 1;
adjustment = (GtkAdjustment *)
gtk_adjustment_new (xmcparas.y, y1, y2, 1, 5, 0);
adjustment = gtk_adjustment_new (xmcparas.y, y1, y2, 1, 5, 0);
tmpwidget = gtk_spin_button_new (adjustment, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (tmpwidget), TRUE);
g_value_set_double (&val, 1.0);
......@@ -1206,9 +1204,8 @@ save_dialog (const gint32 image_ID,
"each frame is rendered."),
NULL);
adjustment = (GtkAdjustment *)
gtk_adjustment_new (xmcvals.delay, CURSOR_MINIMUM_DELAY,
CURSOR_MAX_DELAY, 1, 5, 0);
adjustment = gtk_adjustment_new (xmcvals.delay, CURSOR_MINIMUM_DELAY,
CURSOR_MAX_DELAY, 1, 5, 0);
tmpwidget = gtk_spin_button_new (adjustment, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (tmpwidget), TRUE);
g_value_set_double (&val, 1.0);
......
......@@ -824,10 +824,10 @@ save_image (const gchar *filename,
static gboolean
save_dialog (void)
{
GtkWidget *dialog;
GtkWidget *table;
GtkObject *scale_data;
gboolean run;
GtkWidget *dialog;
GtkWidget *table;
GtkAdjustment *scale_data;
gboolean run;
dialog = gimp_export_dialog_new (_("XPM"), PLUG_IN_BINARY, SAVE_PROC);
......
......@@ -67,9 +67,9 @@ typedef struct
/* Data to use for the dialog */
typedef struct
{
GtkObject *advanced_adj[7];
GtkTreeModel *image_list_all;
GtkTreeModel *image_list_film;
GtkAdjustment *advanced_adj[7];
GtkTreeModel *image_list_all;
GtkTreeModel *image_list_film;
} FilmInterface;
......@@ -1135,13 +1135,13 @@ create_selection_tab (GtkWidget *notebook,
static void
create_advanced_tab (GtkWidget *notebook)
{
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *table;
GtkWidget *frame;
GtkObject *adj;
GtkWidget *button;
gint row;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *table;
GtkWidget *frame;
GtkAdjustment *adj;
GtkWidget *button;
gint row;
frame = gimp_frame_new (_("All Values are Fractions of the Strip Height"));
gtk_container_set_border_width (GTK_CONTAINER (frame), 12);
......@@ -1334,7 +1334,7 @@ film_reset_callback (GtkWidget *widget,
gint i;
for (i = 0; i < G_N_ELEMENTS (advanced_defaults) ; i++)
gtk_adjustment_set_value (GTK_ADJUSTMENT (filmint.advanced_adj[i]),
gtk_adjustment_set_value (filmint.advanced_adj[i],
advanced_defaults[i]);
}
......
......@@ -633,8 +633,7 @@ fp_create_rough (void)
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
data = (GtkAdjustment *)
gtk_adjustment_new (fpvals.roughness, 0, 1.0, 0.05, 0.01, 0.0);
data = gtk_adjustment_new (fpvals.roughness, 0, 1.0, 0.05, 0.01, 0.0);
fp_widgets.roughness_scale = scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL,
data);
......@@ -1398,9 +1397,8 @@ fp_advanced_dialog (GtkWidget *parent)
GTK_EXPAND | GTK_FILL, 0, 0, 0);
}
smoothnessData = (GtkAdjustment *)
gtk_adjustment_new (fpvals.aliasing,
0, 1.0, 0.05, 0.01, 0.0);
smoothnessData = gtk_adjustment_new (fpvals.aliasing,
0, 1.0, 0.05, 0.01, 0.0);
fp_widgets.aliasing_scale = scale =
gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, smoothnessData);
......@@ -1424,10 +1422,9 @@ fp_advanced_dialog (GtkWidget *parent)
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
smoothnessData = (GtkAdjustment *)
gtk_adjustment_new (fpvals.preview_size,
50, MAX_PREVIEW_SIZE,
5, 5, 0.0);
smoothnessData = gtk_adjustment_new (fpvals.preview_size,
50, MAX_PREVIEW_SIZE,
5, 5, 0.0);
fp_widgets.preview_size_scale = scale =
gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, smoothnessData);
......
......@@ -693,14 +693,14 @@ dialog_outside_type_callback (GtkWidget *widget,
static gboolean
dialog_show (void)
{
GtkWidget *dialog;
GtkWidget *mainbox;
GtkWidget *hbox;
GtkWidget *table;
GtkWidget *frame;
GtkWidget *abox;
GtkObject *adj;
gboolean run;
GtkWidget *dialog;
GtkWidget *mainbox;
GtkWidget *hbox;
GtkWidget *table;
GtkWidget *frame;
GtkWidget *abox;
GtkAdjustment *adj;
gboolean run;
gimp_ui_init (PLUG_IN_BINARY, TRUE);
......
......@@ -2377,16 +2377,16 @@ check_config (gint width,
static gboolean
jigsaw_dialog (GimpDrawable *drawable)
{
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkSizeGroup *group;
GtkWidget *frame;
GtkWidget *rbutton1;
GtkWidget *rbutton2;
GtkWidget *table;
GtkObject *adj;
gboolean run;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkSizeGroup *group;
GtkWidget *frame;
GtkWidget *rbutton1;
GtkWidget *rbutton2;
GtkWidget *table;
GtkAdjustment *adj;
gboolean run;
gimp_ui_init (PLUG_IN_BINARY, TRUE);
......
......@@ -228,15 +228,15 @@ typedef struct _channel_st channel_st;
struct _channel_st
{
GtkWidget *vbox; /* vbox of this channel */
gint *spotfn_num; /* which spotfn the menu is controlling */
preview_st prev[3]; /* state for 3 preview widgets */
GtkObject *angle_adj; /* angle adjustment */
GtkWidget *combo; /* popup for spot function */
GtkWidget *menuitem[NUM_SPOTFN]; /* menuitems for each spot function */
GtkWidget *ch_menuitem; /* menuitem for the channel selector */
gint ch_menu_num; /* this channel's position in the selector */
channel_st *next; /* circular list of channels in locked group */
GtkWidget *vbox; /* vbox of this channel */
gint *spotfn_num; /* which spotfn the menu is controlling */
preview_st prev[3]; /* state for 3 preview widgets */
GtkAdjustment *angle_adj; /* angle adjustment */
GtkWidget *combo; /* popup for spot function */
GtkWidget *menuitem[NUM_SPOTFN]; /* menuitems for each spot function */
GtkWidget *ch_menuitem; /* menuitem for the channel selector */
gint ch_menu_num; /* this channel's position in the selector */
channel_st *next; /* circular list of channels in locked group */
};
......@@ -244,18 +244,18 @@ struct _channel_st
* callback functions */
typedef struct
{
GtkWidget *pull_table;
GtkObject *pull; /* black pullout percentage */
GtkObject *input_spi;
GtkObject *output_lpi;
GtkObject *cellsize;
GtkWidget *vbox; /* container for screen info */
GtkWidget *pull_table;
GtkAdjustment *pull; /* black pullout percentage */
GtkAdjustment *input_spi;
GtkAdjustment *output_lpi;
GtkAdjustment *cellsize;
GtkWidget *vbox; /* container for screen info */
/* Notebook for the channels (one per colorspace) */
GtkWidget *channel_notebook[NUM_CS];
GtkWidget *channel_notebook[NUM_CS];
/* room for up to 4 channels per colorspace */
channel_st *chst[NUM_CS][4];
/* room for up to 4 channels per colourspace */
channel_st *chst[NUM_CS][4];
} NewsprintDialog_st;
......@@ -843,7 +843,7 @@ angle_callback (GtkAdjustment *adjustment,
while (c != st)
{
gtk_adjustment_set_value (GTK_ADJUSTMENT (c->angle_adj), *angle_ptr);
gtk_adjustment_set_value (c->angle_adj, *angle_ptr);
c = c->next;
}
......@@ -863,7 +863,7 @@ lpi_callback (GtkAdjustment *adjustment,
cellsize_callback,
data);
gtk_adjustment_set_value (GTK_ADJUSTMENT (st->cellsize),
gtk_adjustment_set_value (st->cellsize,
pvals_ui.input_spi / pvals_ui.output_lpi);
g_signal_handlers_unblock_by_func (st->cellsize,
......@@ -883,7 +883,7 @@ spi_callback (GtkAdjustment *adjustment,
lpi_callback,
data);
gtk_adjustment_set_value (GTK_ADJUSTMENT (st->output_lpi),
gtk_adjustment_set_value (st->output_lpi,
pvals_ui.input_spi / pvals.cell_width);
g_signal_handlers_unblock_by_func (st->output_lpi,
......@@ -903,7 +903,7 @@ cellsize_callback (GtkAdjustment *adjustment,
lpi_callback,
data);
gtk_adjustment_set_value (GTK_ADJUSTMENT (st->output_lpi),
gtk_adjustment_set_value (st->output_lpi,
pvals_ui.input_spi / pvals.cell_width);
g_signal_handlers_unblock_by_func (st->output_lpi,
......@@ -940,7 +940,7 @@ newsprint_defaults_callback (GtkWidget *widget,
c = 0;
while (ct->name)
{
gtk_adjustment_set_value (GTK_ADJUSTMENT (chst[c]->angle_adj),
gtk_adjustment_set_value (chst[c]->angle_adj,
*(ct->factory_angle));
/* change the popup menu and also activate the menuitem in
......@@ -1138,19 +1138,19 @@ newsprint_dialog (GimpDrawable *drawable)
{
/* widgets we need from callbacks stored here */
NewsprintDialog_st st;
GtkWidget *dialog;
GtkWidget *paned;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *preview;
GtkWidget *frame;
GtkWidget *table;
GtkObject *adj;
GSList *group = NULL;
gint bpp;
gint i;
gdouble xres, yres;
gboolean run;
GtkWidget *dialog;
GtkWidget *paned;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *preview;
GtkWidget *frame;
GtkWidget *table;
GtkAdjustment *adj;
GSList *group = NULL;
gint bpp;
gint i;
gdouble xres, yres;
gboolean run;
gimp_ui_init (PLUG_IN_BINARY, TRUE);
......
......@@ -1001,16 +1001,16 @@ nlfilter (GimpDrawable *drawable,
static gboolean
nlfilter_dialog (GimpDrawable *drawable)
{
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *frame;
GtkWidget *alpha_trim;
GtkWidget *opt_est;
GtkWidget *edge_enhance;
GtkWidget *table;
GtkObject *adj;
gboolean run;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *frame;
GtkWidget *alpha_trim;
GtkWidget *opt_est;
GtkWidget *edge_enhance;
GtkWidget *table;
GtkAdjustment *adj;
gboolean run;
gimp_ui_init (PLUG_IN_BINARY, TRUE);
......
......@@ -761,15 +761,15 @@ oilify_map_constrain (gint32 image_id G_GNUC_UNUSED,
static gint
oilify_dialog (GimpDrawable *drawable)
{
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *table;
GtkWidget *toggle;
GtkWidget *combo;
GtkObject *adj;
gboolean can_use_mode_inten;
gboolean ret;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *table;
GtkWidget *toggle;
GtkWidget *combo;
GtkAdjustment *adj;
gboolean can_use_mode_inten;
gboolean ret;
can_use_mode_inten = gimp_drawable_is_rgb (drawable->drawable_id);
......
......@@ -824,12 +824,12 @@ find_constants (gdouble n_p[],
static gboolean
photocopy_dialog (GimpDrawable *drawable)
{
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *table;
GtkObject *scale_data;
gboolean run;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *table;
GtkAdjustment *scale_data;
gboolean run;
gimp_ui_init (PLUG_IN_BINARY, FALSE);
......
......@@ -1293,17 +1293,17 @@ level_out_events (GtkWidget *widget,
static void
smp_dialog (void)
{
GtkWidget *dialog;
GtkWidget *hbox;
GtkWidget *vbox2;
GtkWidget *frame;
GtkWidget *table;
GtkWidget *check_button;
GtkWidget *label;
GtkWidget *combo;
GtkWidget *spinbutton;
GtkObject *data;
gint ty;
GtkWidget *dialog;
GtkWidget *hbox;
GtkWidget *vbox2;
GtkWidget *frame;
GtkWidget *table;
GtkWidget *check_button;
GtkWidget *label;
GtkWidget *combo;
GtkWidget *spinbutton;
GtkAdjustment *data;
gint ty;
/* set flags for check buttons from mode value bits */
if (g_Sdebug)
......
......@@ -460,12 +460,12 @@ sharpen (GimpDrawable *drawable)
static gboolean
sharpen_dialog (GimpDrawable *drawable)
{
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *table;
GtkObject *adj;
gboolean run;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *table;
GtkAdjustment *adj;
gboolean run;
gimp_ui_init (PLUG_IN_BINARY, TRUE);
......
......@@ -616,12 +616,12 @@ find_constants (gdouble n_p[],
static gboolean
softglow_dialog (GimpDrawable *drawable)
{
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *table;
GtkObject *scale_data;
gboolean run;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *table;
GtkAdjustment *scale_data;
gboolean run;
gimp_ui_init (PLUG_IN_BINARY, FALSE);
......
......@@ -321,16 +321,16 @@ run (const gchar *name,
static gboolean
sparkle_dialog (GimpDrawable *drawable)
{
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *table;
GtkWidget *toggle;
GtkWidget *r1, *r2, *r3;
GtkObject *scale_data;
gboolean run;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *table;
GtkWidget *toggle;
GtkWidget *r1, *r2, *r3;
GtkAdjustment *scale_data;
gboolean run;
gimp_ui_init (PLUG_IN_BINARY, FALSE);
......
......@@ -327,15 +327,15 @@ static gdouble turbulence (gdouble *point,
static GtkTreeView *texturelist = NULL;
static GtkObject *scalexscale, *scaleyscale, *scalezscale;
static GtkObject *rotxscale, *rotyscale, *rotzscale;
static GtkObject *posxscale, *posyscale, *poszscale;
static GtkObject *scalescale;
static GtkObject *turbulencescale;
static GtkObject *amountscale;
static GtkObject *expscale;
static GtkWidget *typemenu;
static GtkWidget *texturemenu;
static GtkAdjustment *scalexscale, *scaleyscale, *scalezscale;
static GtkAdjustment *rotxscale, *rotyscale, *rotzscale;
static GtkAdjustment *posxscale, *posyscale, *poszscale;
static GtkAdjustment *scalescale;
static GtkAdjustment *turbulencescale;
static GtkAdjustment *amountscale;
static GtkAdjustment *expscale;
static GtkWidget *typemenu;
static GtkWidget *texturemenu;
#define DOT(a,b) (a[0] * b[0] + a[1] * b[1] + a[2] * b[2])
......@@ -1823,25 +1823,24 @@ setvals (texture *t)
return;
noupdate = TRUE;
gtk_adjustment_set_value (GTK_ADJUSTMENT (amountscale), t->amount);
gtk_adjustment_set_value (amountscale, t->amount);
gtk_adjustment_set_value (GTK_ADJUSTMENT (scalescale), t->oscale);
gtk_adjustment_set_value (scalescale, t->oscale);
gtk_adjustment_set_value (GTK_ADJUSTMENT (scalexscale), t->scale.x);
gtk_adjustment_set_value (GTK_ADJUSTMENT (scaleyscale), t->scale.y);
gtk_adjustment_set_value (GTK_ADJUSTMENT (scalezscale), t->scale.z);
gtk_adjustment_set_value (scalexscale, t->scale.x);
gtk_adjustment_set_value (scaleyscale, t->scale.y);
gtk_adjustment_set_value (scalezscale, t->scale.z);
gtk_adjustment_set_value (GTK_ADJUSTMENT (rotxscale), t->rotate.x);
gtk_adjustment_set_value (GTK_ADJUSTMENT (rotyscale), t->rotate.y);
gtk_adjustment_set_value (GTK_ADJUSTMENT (rotzscale), t->rotate.z);
gtk_adjustment_set_value (rotxscale, t->rotate.x);
gtk_adjustment_set_value (rotyscale, t->rotate.y);
gtk_adjustment_set_value (rotzscale, t->rotate.z);
gtk_adjustment_set_value (GTK_ADJUSTMENT (posxscale), t->translate.x);
gtk_adjustment_set_value (GTK_ADJUSTMENT (posyscale), t->translate.y);
gtk_adjustment_set_value (GTK_ADJUSTMENT (poszscale), t->translate.z);
gtk_adjustment_set_value (posxscale, t->translate.x);
gtk_adjustment_set_value (posyscale, t->translate.y);
gtk_adjustment_set_value (poszscale, t->translate.z);
gtk_adjustment_set_value (GTK_ADJUSTMENT (turbulencescale),
t->turbulence.x);
gtk_adjustment_set_value (GTK_ADJUSTMENT (expscale), t->exp);
gtk_adjustment_set_value (turbulencescale, t->turbulence.x);
gtk_adjustment_set_value (expscale, t->exp);
drawcolor1 (NULL);
drawcolor2 (NULL);
......@@ -2378,25 +2377,25 @@ getscales (GtkWidget *widget,
if (!t)
return;
t->amount = gtk_adjustment_get_value (GTK_ADJUSTMENT (amountscale));
t->exp = gtk_adjustment_get_value (GTK_ADJUSTMENT (expscale));
t->amount = gtk_adjustment_get_value (amountscale);
t->exp = gtk_adjustment_get_value (expscale);
f = gtk_adjustment_get_value (GTK_ADJUSTMENT (turbulencescale));
f = gtk_adjustment_get_value (turbulencescale);
vset (&t->turbulence, f, f, f);
t->oscale = gtk_adjustment_get_value (GTK_ADJUSTMENT (scalescale));
t->oscale = gtk_adjustment_get_value (scalescale);
t->scale.x = gtk_adjustment_get_value (GTK_ADJUSTMENT (scalexscale));
t->scale.y = gtk_adjustment_get_value (GTK_ADJUSTMENT (scaleyscale));
t->scale.z = gtk_adjustment_get_value (GTK_ADJUSTMENT (scalezscale));
t->scale.x = gtk_adjustment_get_value (scalexscale);
t->scale.y = gtk_adjustment_get_value (scaleyscale);
t->scale.z = gtk_adjustment_get_value (scalezscale);
t->rotate.x = gtk_adjustment_get_value (GTK_ADJUSTMENT (rotxscale));
t->rotate.y = gtk_adjustment_get_value (GTK_ADJUSTMENT (rotyscale));
t->rotate.z = gtk_adjustment_get_value (GTK_ADJUSTMENT (rotzscale));
t->rotate.x = gtk_adjustment_get_value (rotxscale);
t->rotate.y = gtk_adjustment_get_value (rotyscale);
t->rotate.z = gtk_adjustment_get_value (rotzscale);