mirror of https://github.com/GNOME/gimp.git
plug-ins: s/GtkObject/GtkAdjustment/g in plug-ins/common/
This commit is contained in:
parent
95cd1aa142
commit
eb8487b487
|
@ -618,7 +618,7 @@ align_layers_dialog (void)
|
|||
GtkWidget *table;
|
||||
GtkWidget *combo;
|
||||
GtkWidget *toggle;
|
||||
GtkObject *adj;
|
||||
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,8 +956,7 @@ gih_save_dialog (gint32 image_ID)
|
|||
*/
|
||||
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
|
||||
|
||||
adjustment = (GtkAdjustment *)
|
||||
gtk_adjustment_new (gihparams.cellwidth,
|
||||
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);
|
||||
|
@ -981,8 +979,7 @@ 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,
|
||||
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);
|
||||
|
@ -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,
|
||||
|
|
|
@ -1818,7 +1818,7 @@ load_dialog (const gchar *filename,
|
|||
GtkWidget *table;
|
||||
GtkWidget *combo;
|
||||
GtkWidget *button;
|
||||
GtkObject *adj;
|
||||
GtkAdjustment *adj;
|
||||
goffset file_size;
|
||||
gboolean run;
|
||||
|
||||
|
|
|
@ -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,8 +1204,7 @@ save_dialog (const gint32 image_ID,
|
|||
"each frame is rendered."),
|
||||
NULL);
|
||||
|
||||
adjustment = (GtkAdjustment *)
|
||||
gtk_adjustment_new (xmcvals.delay, CURSOR_MINIMUM_DELAY,
|
||||
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);
|
||||
|
|
|
@ -826,7 +826,7 @@ save_dialog (void)
|
|||
{
|
||||
GtkWidget *dialog;
|
||||
GtkWidget *table;
|
||||
GtkObject *scale_data;
|
||||
GtkAdjustment *scale_data;
|
||||
gboolean run;
|
||||
|
||||
dialog = gimp_export_dialog_new (_("XPM"), PLUG_IN_BINARY, SAVE_PROC);
|
||||
|
|
|
@ -67,7 +67,7 @@ typedef struct
|
|||
/* Data to use for the dialog */
|
||||
typedef struct
|
||||
{
|
||||
GtkObject *advanced_adj[7];
|
||||
GtkAdjustment *advanced_adj[7];
|
||||
GtkTreeModel *image_list_all;
|
||||
GtkTreeModel *image_list_film;
|
||||
} FilmInterface;
|
||||
|
@ -1139,7 +1139,7 @@ create_advanced_tab (GtkWidget *notebook)
|
|||
GtkWidget *hbox;
|
||||
GtkWidget *table;
|
||||
GtkWidget *frame;
|
||||
GtkObject *adj;
|
||||
GtkAdjustment *adj;
|
||||
GtkWidget *button;
|
||||
gint row;
|
||||
|
||||
|
@ -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,8 +1397,7 @@ fp_advanced_dialog (GtkWidget *parent)
|
|||
GTK_EXPAND | GTK_FILL, 0, 0, 0);
|
||||
}
|
||||
|
||||
smoothnessData = (GtkAdjustment *)
|
||||
gtk_adjustment_new (fpvals.aliasing,
|
||||
smoothnessData = gtk_adjustment_new (fpvals.aliasing,
|
||||
0, 1.0, 0.05, 0.01, 0.0);
|
||||
|
||||
fp_widgets.aliasing_scale = scale =
|
||||
|
@ -1424,8 +1422,7 @@ fp_advanced_dialog (GtkWidget *parent)
|
|||
gtk_container_add (GTK_CONTAINER (frame), vbox);
|
||||
gtk_widget_show (vbox);
|
||||
|
||||
smoothnessData = (GtkAdjustment *)
|
||||
gtk_adjustment_new (fpvals.preview_size,
|
||||
smoothnessData = gtk_adjustment_new (fpvals.preview_size,
|
||||
50, MAX_PREVIEW_SIZE,
|
||||
5, 5, 0.0);
|
||||
|
||||
|
|
|
@ -699,7 +699,7 @@ dialog_show (void)
|
|||
GtkWidget *table;
|
||||
GtkWidget *frame;
|
||||
GtkWidget *abox;
|
||||
GtkObject *adj;
|
||||
GtkAdjustment *adj;
|
||||
gboolean run;
|
||||
|
||||
gimp_ui_init (PLUG_IN_BINARY, TRUE);
|
||||
|
|
|
@ -2385,7 +2385,7 @@ jigsaw_dialog (GimpDrawable *drawable)
|
|||
GtkWidget *rbutton1;
|
||||
GtkWidget *rbutton2;
|
||||
GtkWidget *table;
|
||||
GtkObject *adj;
|
||||
GtkAdjustment *adj;
|
||||
gboolean run;
|
||||
|
||||
gimp_ui_init (PLUG_IN_BINARY, TRUE);
|
||||
|
|
|
@ -231,7 +231,7 @@ 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 */
|
||||
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 */
|
||||
|
@ -245,16 +245,16 @@ struct _channel_st
|
|||
typedef struct
|
||||
{
|
||||
GtkWidget *pull_table;
|
||||
GtkObject *pull; /* black pullout percentage */
|
||||
GtkObject *input_spi;
|
||||
GtkObject *output_lpi;
|
||||
GtkObject *cellsize;
|
||||
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];
|
||||
|
||||
/* room for up to 4 channels per colorspace */
|
||||
/* 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
|
||||
|
@ -1145,7 +1145,7 @@ newsprint_dialog (GimpDrawable *drawable)
|
|||
GtkWidget *preview;
|
||||
GtkWidget *frame;
|
||||
GtkWidget *table;
|
||||
GtkObject *adj;
|
||||
GtkAdjustment *adj;
|
||||
GSList *group = NULL;
|
||||
gint bpp;
|
||||
gint i;
|
||||
|
|
|
@ -1009,7 +1009,7 @@ nlfilter_dialog (GimpDrawable *drawable)
|
|||
GtkWidget *opt_est;
|
||||
GtkWidget *edge_enhance;
|
||||
GtkWidget *table;
|
||||
GtkObject *adj;
|
||||
GtkAdjustment *adj;
|
||||
gboolean run;
|
||||
|
||||
gimp_ui_init (PLUG_IN_BINARY, TRUE);
|
||||
|
|
|
@ -767,7 +767,7 @@ oilify_dialog (GimpDrawable *drawable)
|
|||
GtkWidget *table;
|
||||
GtkWidget *toggle;
|
||||
GtkWidget *combo;
|
||||
GtkObject *adj;
|
||||
GtkAdjustment *adj;
|
||||
gboolean can_use_mode_inten;
|
||||
gboolean ret;
|
||||
|
||||
|
|
|
@ -828,7 +828,7 @@ photocopy_dialog (GimpDrawable *drawable)
|
|||
GtkWidget *main_vbox;
|
||||
GtkWidget *preview;
|
||||
GtkWidget *table;
|
||||
GtkObject *scale_data;
|
||||
GtkAdjustment *scale_data;
|
||||
gboolean run;
|
||||
|
||||
gimp_ui_init (PLUG_IN_BINARY, FALSE);
|
||||
|
|
|
@ -1302,7 +1302,7 @@ smp_dialog (void)
|
|||
GtkWidget *label;
|
||||
GtkWidget *combo;
|
||||
GtkWidget *spinbutton;
|
||||
GtkObject *data;
|
||||
GtkAdjustment *data;
|
||||
gint ty;
|
||||
|
||||
/* set flags for check buttons from mode value bits */
|
||||
|
|
|
@ -464,7 +464,7 @@ sharpen_dialog (GimpDrawable *drawable)
|
|||
GtkWidget *main_vbox;
|
||||
GtkWidget *preview;
|
||||
GtkWidget *table;
|
||||
GtkObject *adj;
|
||||
GtkAdjustment *adj;
|
||||
gboolean run;
|
||||
|
||||
gimp_ui_init (PLUG_IN_BINARY, TRUE);
|
||||
|
|
|
@ -620,7 +620,7 @@ softglow_dialog (GimpDrawable *drawable)
|
|||
GtkWidget *main_vbox;
|
||||
GtkWidget *preview;
|
||||
GtkWidget *table;
|
||||
GtkObject *scale_data;
|
||||
GtkAdjustment *scale_data;
|
||||
gboolean run;
|
||||
|
||||
gimp_ui_init (PLUG_IN_BINARY, FALSE);
|
||||
|
|
|
@ -329,7 +329,7 @@ sparkle_dialog (GimpDrawable *drawable)
|
|||
GtkWidget *table;
|
||||
GtkWidget *toggle;
|
||||
GtkWidget *r1, *r2, *r3;
|
||||
GtkObject *scale_data;
|
||||
GtkAdjustment *scale_data;
|
||||
gboolean run;
|
||||
|
||||
gimp_ui_init (PLUG_IN_BINARY, FALSE);
|
||||
|
|
|
@ -327,13 +327,13 @@ 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 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;
|
||||
|
||||
|
@ -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);
|
||||
|
||||
t->translate.x = gtk_adjustment_get_value (GTK_ADJUSTMENT (posxscale));
|
||||
t->translate.y = gtk_adjustment_get_value (GTK_ADJUSTMENT (posyscale));
|
||||
t->translate.z = gtk_adjustment_get_value (GTK_ADJUSTMENT (poszscale));
|
||||
t->translate.x = gtk_adjustment_get_value (posxscale);
|
||||
t->translate.y = gtk_adjustment_get_value (posyscale);
|
||||
t->translate.z = gtk_adjustment_get_value (poszscale);
|
||||
|
||||
restartrender ();
|
||||
}
|
||||
|
|
|
@ -158,8 +158,8 @@ typedef struct
|
|||
|
||||
gint x; /* X - pos of tile */
|
||||
gint y; /* Y - pos of tile */
|
||||
GtkObject *r_adj; /* row adjustment */
|
||||
GtkObject *c_adj; /* column adjustment */
|
||||
GtkAdjustment *r_adj; /* row adjustment */
|
||||
GtkAdjustment *c_adj; /* column adjustment */
|
||||
GtkWidget *applybut; /* The apply button */
|
||||
} Exp_Call;
|
||||
|
||||
|
@ -356,8 +356,8 @@ tileit_dialog (void)
|
|||
GtkWidget *button;
|
||||
GtkWidget *label;
|
||||
GtkWidget *spinbutton;
|
||||
GtkObject *adj;
|
||||
GtkObject *scale;
|
||||
GtkAdjustment *adj;
|
||||
GtkAdjustment *scale;
|
||||
GtkWidget *toggle;
|
||||
GSList *orientation_group = NULL;
|
||||
gboolean run;
|
||||
|
|
|
@ -325,8 +325,8 @@ new_unit_dialog (GtkWidget *main_dialog,
|
|||
break;
|
||||
|
||||
identifier = g_strdup (gtk_entry_get_text (GTK_ENTRY (identifier_entry)));
|
||||
factor = gtk_adjustment_get_value (GTK_ADJUSTMENT (factor_adj));
|
||||
digits = gtk_adjustment_get_value (GTK_ADJUSTMENT (digits_adj));
|
||||
factor = gtk_adjustment_get_value (factor_adj);
|
||||
digits = gtk_adjustment_get_value (digits_adj);
|
||||
symbol = g_strdup (gtk_entry_get_text (GTK_ENTRY (symbol_entry)));
|
||||
abbreviation = g_strdup (gtk_entry_get_text (GTK_ENTRY (abbreviation_entry)));
|
||||
singular = g_strdup (gtk_entry_get_text (GTK_ENTRY (singular_entry)));
|
||||
|
|
|
@ -830,7 +830,7 @@ unsharp_mask_dialog (GimpDrawable *drawable)
|
|||
GtkWidget *main_vbox;
|
||||
GtkWidget *preview;
|
||||
GtkWidget *table;
|
||||
GtkObject *adj;
|
||||
GtkAdjustment *adj;
|
||||
gboolean run;
|
||||
|
||||
gimp_ui_init (PLUG_IN_BINARY, TRUE);
|
||||
|
|
|
@ -634,7 +634,7 @@ create_main_dialog (void)
|
|||
GtkWidget *frame;
|
||||
GtkWidget *table;
|
||||
GtkWidget *combo;
|
||||
GtkObject *scale_data;
|
||||
GtkAdjustment *scale_data;
|
||||
gint row;
|
||||
gboolean run;
|
||||
|
||||
|
|
|
@ -362,7 +362,7 @@ warp_dialog (GimpDrawable *drawable)
|
|||
GtkWidget *frame;
|
||||
GtkWidget *table;
|
||||
GtkWidget *spinbutton;
|
||||
GtkObject *adj;
|
||||
GtkAdjustment *adj;
|
||||
GtkWidget *combo;
|
||||
GtkSizeGroup *label_group;
|
||||
GtkSizeGroup *spin_group;
|
||||
|
|
|
@ -342,7 +342,7 @@ wavelet_decompose_dialog (void)
|
|||
GtkWidget *main_vbox;
|
||||
GtkWidget *table;
|
||||
GtkWidget *button;
|
||||
GtkObject *adj;
|
||||
GtkAdjustment *adj;
|
||||
gboolean run;
|
||||
|
||||
gimp_ui_init (PLUG_IN_BINARY, TRUE);
|
||||
|
|
|
@ -291,8 +291,7 @@ webpage_dialog (void)
|
|||
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
|
||||
gtk_widget_show (label);
|
||||
|
||||
adjustment = (GtkAdjustment *)
|
||||
gtk_adjustment_new (webpagevals.width,
|
||||
adjustment = gtk_adjustment_new (webpagevals.width,
|
||||
1, 8192, 1, 10, 0);
|
||||
spinbutton = gtk_spin_button_new (adjustment, 1.0, 0);
|
||||
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
|
||||
|
|
Loading…
Reference in New Issue