[gimp/gtk3-port: 115/130] plug-ins: more s/GtkObject/GtkAdjustment/
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 115/130] plug-ins: more s/GtkObject/GtkAdjustment/
- Date: Fri, 19 Nov 2010 11:28:15 +0000 (UTC)
commit 015014571f0baeb4d299dd695351f5573ffb964f
Author: Michael Natterer <mitch gimp org>
Date: Mon Oct 25 01:35:35 2010 +0200
plug-ins: more s/GtkObject/GtkAdjustment/
plug-ins/file-fli/fli-gimp.c | 24 +++---
plug-ins/file-xjt/xjt.c | 10 +-
plug-ins/flame/flame.c | 40 ++++----
.../fractal-explorer/fractal-explorer-dialogs.c | 22 +++---
plug-ins/fractal-explorer/fractal-explorer.h | 40 ++++----
plug-ins/gradient-flare/gradient-flare.c | 92 ++++++++++----------
6 files changed, 114 insertions(+), 114 deletions(-)
---
diff --git a/plug-ins/file-fli/fli-gimp.c b/plug-ins/file-fli/fli-gimp.c
index f343735..22d600b 100644
--- a/plug-ins/file-fli/fli-gimp.c
+++ b/plug-ins/file-fli/fli-gimp.c
@@ -827,12 +827,12 @@ save_image (const gchar *filename,
static gboolean
load_dialog (const gchar *filename)
{
- GtkWidget *dialog;
- GtkWidget *table;
- GtkWidget *spinbutton;
- GtkObject *adj;
- gint32 width, height, nframes;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *table;
+ GtkWidget *spinbutton;
+ GtkAdjustment *adj;
+ gint32 width, height, nframes;
+ gboolean run;
get_info (filename, &width, &height, &nframes, NULL);
@@ -897,12 +897,12 @@ load_dialog (const gchar *filename)
static gboolean
save_dialog (gint32 image_id)
{
- GtkWidget *dialog;
- GtkWidget *table;
- GtkWidget *spinbutton;
- GtkObject *adj;
- gint nframes;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *table;
+ GtkWidget *spinbutton;
+ GtkAdjustment *adj;
+ gint nframes;
+ gboolean run;
g_free (gimp_image_get_layers (image_id, &nframes));
diff --git a/plug-ins/file-xjt/xjt.c b/plug-ins/file-xjt/xjt.c
index 79263e4..7b659fa 100644
--- a/plug-ins/file-xjt/xjt.c
+++ b/plug-ins/file-xjt/xjt.c
@@ -852,11 +852,11 @@ p_to_XJTUnitType(GimpUnit intype)
static gboolean
save_dialog (void)
{
- GtkWidget *dlg;
- GtkWidget *table;
- GtkWidget *toggle;
- GtkObject *scale_data;
- gboolean run;
+ GtkWidget *dlg;
+ GtkWidget *table;
+ GtkWidget *toggle;
+ GtkAdjustment *scale_data;
+ gboolean run;
gimp_ui_init (PLUG_IN_BINARY, FALSE);
diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c
index 0972e70..45fa0f0 100644
--- a/plug-ins/flame/flame.c
+++ b/plug-ins/flame/flame.c
@@ -629,16 +629,16 @@ edit_callback (GtkWidget *widget,
if (edit_dialog == NULL)
{
- GtkWidget *main_vbox;
- GtkWidget *frame;
- GtkWidget *table;
- GtkWidget *vbox;
- GtkWidget *hbox;
- GtkWidget *button;
- GtkWidget *combo;
- GtkWidget *label;
- GtkObject *adj;
- gint i, j;
+ GtkWidget *main_vbox;
+ GtkWidget *frame;
+ GtkWidget *table;
+ GtkWidget *vbox;
+ GtkWidget *hbox;
+ GtkWidget *button;
+ GtkWidget *combo;
+ GtkWidget *label;
+ GtkAdjustment *adj;
+ gint i, j;
edit_dialog = gimp_dialog_new (_("Edit Flame"), PLUG_IN_BINARY,
parent, GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -949,16 +949,16 @@ cmap_constrain (gint32 image_id,
static gboolean
flame_dialog (void)
{
- GtkWidget *main_vbox;
- GtkWidget *notebook;
- GtkWidget *label;
- GtkWidget *frame;
- GtkWidget *abox;
- GtkWidget *button;
- GtkWidget *table;
- GtkWidget *box;
- GtkObject *adj;
- gboolean run;
+ GtkWidget *main_vbox;
+ GtkWidget *notebook;
+ GtkWidget *label;
+ GtkWidget *frame;
+ GtkWidget *abox;
+ GtkWidget *button;
+ GtkWidget *table;
+ GtkWidget *box;
+ GtkAdjustment *adj;
+ gboolean run;
gimp_ui_init (PLUG_IN_BINARY, TRUE);
diff --git a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
index 60bb99f..e1432ec 100644
--- a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
+++ b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
@@ -1441,17 +1441,17 @@ dialog_change_scale (void)
{
ready_now = FALSE;
- gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->xmin), wvals.xmin);
- gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->xmax), wvals.xmax);
- gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->ymin), wvals.ymin);
- gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->ymax), wvals.ymax);
- gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->iter), wvals.iter);
- gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->cx), wvals.cx);
- gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->cy), wvals.cy);
-
- gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->red), wvals.redstretch);
- gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->green),wvals.greenstretch);
- gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->blue), wvals.bluestretch);
+ gtk_adjustment_set_value (elements->xmin, wvals.xmin);
+ gtk_adjustment_set_value (elements->xmax, wvals.xmax);
+ gtk_adjustment_set_value (elements->ymin, wvals.ymin);
+ gtk_adjustment_set_value (elements->ymax, wvals.ymax);
+ gtk_adjustment_set_value (elements->iter, wvals.iter);
+ gtk_adjustment_set_value (elements->cx, wvals.cx);
+ gtk_adjustment_set_value (elements->cy, wvals.cy);
+
+ gtk_adjustment_set_value (elements->red, wvals.redstretch);
+ gtk_adjustment_set_value (elements->green,wvals.greenstretch);
+ gtk_adjustment_set_value (elements->blue, wvals.bluestretch);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON (elements->type[wvals.fractaltype]), TRUE);
diff --git a/plug-ins/fractal-explorer/fractal-explorer.h b/plug-ins/fractal-explorer/fractal-explorer.h
index a276c14..78d6dcf 100644
--- a/plug-ins/fractal-explorer/fractal-explorer.h
+++ b/plug-ins/fractal-explorer/fractal-explorer.h
@@ -99,32 +99,32 @@ typedef struct _DialogElements DialogElements;
struct _DialogElements
{
- GtkWidget *type[NUM_TYPES];
- GtkObject *xmin;
- GtkObject *xmax;
- GtkObject *ymin;
- GtkObject *ymax;
- GtkObject *iter;
- GtkObject *cx;
- GtkObject *cy;
+ GtkWidget *type[NUM_TYPES];
+ GtkAdjustment *xmin;
+ GtkAdjustment *xmax;
+ GtkAdjustment *ymin;
+ GtkAdjustment *ymax;
+ GtkAdjustment *iter;
+ GtkAdjustment *cx;
+ GtkAdjustment *cy;
- GtkObject *ncol;
- GtkWidget *useloglog;
+ GtkAdjustment *ncol;
+ GtkWidget *useloglog;
- GtkObject *red;
- GtkObject *green;
- GtkObject *blue;
+ GtkAdjustment *red;
+ GtkAdjustment *green;
+ GtkAdjustment *blue;
- GtkWidget *redmode[3];
- GtkWidget *redinvert;
+ GtkWidget *redmode[3];
+ GtkWidget *redinvert;
- GtkWidget *greenmode[3];
- GtkWidget *greeninvert;
+ GtkWidget *greenmode[3];
+ GtkWidget *greeninvert;
- GtkWidget *bluemode[3];
- GtkWidget *blueinvert;
+ GtkWidget *bluemode[3];
+ GtkWidget *blueinvert;
- GtkWidget *colormode[2];
+ GtkWidget *colormode[2];
};
diff --git a/plug-ins/gradient-flare/gradient-flare.c b/plug-ins/gradient-flare/gradient-flare.c
index 1206f7c..b1b77a4 100644
--- a/plug-ins/gradient-flare/gradient-flare.c
+++ b/plug-ins/gradient-flare/gradient-flare.c
@@ -2695,16 +2695,16 @@ static void
dlg_make_page_settings (GFlareDialog *dlg,
GtkWidget *notebook)
{
- GtkWidget *main_vbox;
- GtkWidget *frame;
- GtkWidget *center;
- GtkWidget *chain;
- GtkWidget *table;
- GtkWidget *button;
- GtkWidget *asup_table;
- GtkObject *adj;
- gdouble xres, yres;
- gint row;
+ GtkWidget *main_vbox;
+ GtkWidget *frame;
+ GtkWidget *center;
+ GtkWidget *chain;
+ GtkWidget *table;
+ GtkWidget *button;
+ GtkWidget *asup_table;
+ GtkAdjustment *adj;
+ gdouble xres, yres;
+ gint row;
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
@@ -3430,12 +3430,12 @@ static void
ed_make_page_general (GFlareEditor *ed,
GtkWidget *notebook)
{
- GFlare *gflare = ed->gflare;
- GtkWidget *vbox;
- GtkWidget *frame;
- GtkWidget *table;
- GtkWidget *combo;
- GtkObject *adj;
+ GFlare *gflare = ed->gflare;
+ GtkWidget *vbox;
+ GtkWidget *frame;
+ GtkWidget *table;
+ GtkWidget *combo;
+ GtkAdjustment *adj;
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
@@ -3536,13 +3536,13 @@ static void
ed_make_page_glow (GFlareEditor *ed,
GtkWidget *notebook)
{
- GFlare *gflare = ed->gflare;
- GradientMenu *gm;
- GtkWidget *vbox;
- GtkWidget *frame;
- GtkWidget *table;
- GtkObject *adj;
- gint row;
+ GFlare *gflare = ed->gflare;
+ GradientMenu *gm;
+ GtkWidget *vbox;
+ GtkWidget *frame;
+ GtkWidget *table;
+ GtkAdjustment *adj;
+ gint row;
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
@@ -3639,13 +3639,13 @@ static void
ed_make_page_rays (GFlareEditor *ed,
GtkWidget *notebook)
{
- GFlare *gflare = ed->gflare;
- GradientMenu *gm;
- GtkWidget *vbox;
- GtkWidget *frame;
- GtkWidget *table;
- GtkObject *adj;
- gint row;
+ GFlare *gflare = ed->gflare;
+ GradientMenu *gm;
+ GtkWidget *vbox;
+ GtkWidget *frame;
+ GtkWidget *table;
+ GtkAdjustment *adj;
+ gint row;
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
@@ -3769,22 +3769,22 @@ static void
ed_make_page_sflare (GFlareEditor *ed,
GtkWidget *notebook)
{
- GFlare *gflare = ed->gflare;
- GradientMenu *gm;
- GtkWidget *vbox;
- GtkWidget *table;
- GtkWidget *frame;
- GtkWidget *shape_vbox;
- GSList *shape_group = NULL;
- GtkWidget *polygon_hbox;
- GtkWidget *seed_hbox;
- GtkWidget *toggle;
- GtkWidget *label;
- GtkWidget *seed;
- GtkWidget *entry;
- GtkObject *adj;
- gchar buf[256];
- gint row;
+ GFlare *gflare = ed->gflare;
+ GradientMenu *gm;
+ GtkWidget *vbox;
+ GtkWidget *table;
+ GtkWidget *frame;
+ GtkWidget *shape_vbox;
+ GSList *shape_group = NULL;
+ GtkWidget *polygon_hbox;
+ GtkWidget *seed_hbox;
+ GtkWidget *toggle;
+ GtkWidget *label;
+ GtkWidget *seed;
+ GtkWidget *entry;
+ GtkAdjustment *adj;
+ gchar buf[256];
+ gint row;
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]