[gimp/gtk3-port: 65/137] app: s/GtkObject/GtkAdjustment/ in app/dialogs/
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 65/137] app: s/GtkObject/GtkAdjustment/ in app/dialogs/
- Date: Mon, 22 Nov 2010 10:25:33 +0000 (UTC)
commit d40aed18e3075fddea0053f88686081172edee95
Author: Michael Natterer <mitch gimp org>
Date: Tue Oct 19 13:07:46 2010 +0200
app: s/GtkObject/GtkAdjustment/ in app/dialogs/
app/dialogs/channel-options-dialog.c | 2 +-
app/dialogs/convert-dialog.c | 2 +-
app/dialogs/layer-options-dialog.c | 2 +-
app/dialogs/offset-dialog.c | 26 +++++++++++-----------
app/dialogs/palette-import-dialog.c | 39 ++++++++++++++-------------------
app/dialogs/print-size-dialog.c | 2 +-
app/dialogs/resize-dialog.c | 30 +++++++++++++-------------
7 files changed, 49 insertions(+), 54 deletions(-)
---
diff --git a/app/dialogs/channel-options-dialog.c b/app/dialogs/channel-options-dialog.c
index 1432c9c..0f9a234 100644
--- a/app/dialogs/channel-options-dialog.c
+++ b/app/dialogs/channel-options-dialog.c
@@ -69,7 +69,7 @@ channel_options_dialog_new (GimpImage *image,
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *table;
- GtkObject *opacity_adj;
+ GtkAdjustment *opacity_adj;
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
g_return_val_if_fail (channel == NULL || GIMP_IS_CHANNEL (channel), NULL);
diff --git a/app/dialogs/convert-dialog.c b/app/dialogs/convert-dialog.c
index 58fcde9..8cb675e 100644
--- a/app/dialogs/convert-dialog.c
+++ b/app/dialogs/convert-dialog.c
@@ -98,7 +98,7 @@ convert_dialog_new (GimpImage *image,
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *label;
- GtkObject *adjustment;
+ GtkAdjustment *adjustment;
GtkWidget *spinbutton;
GtkWidget *frame;
GtkWidget *toggle;
diff --git a/app/dialogs/layer-options-dialog.c b/app/dialogs/layer-options-dialog.c
index d5d4ad2..ce37270 100644
--- a/app/dialogs/layer-options-dialog.c
+++ b/app/dialogs/layer-options-dialog.c
@@ -66,7 +66,7 @@ layer_options_dialog_new (GimpImage *image,
GtkWidget *vbox;
GtkWidget *table;
GtkWidget *label;
- GtkObject *adjustment;
+ GtkAdjustment *adjustment;
GtkWidget *spinbutton;
GtkWidget *frame;
GtkWidget *button;
diff --git a/app/dialogs/offset-dialog.c b/app/dialogs/offset-dialog.c
index 7899464..7bc1ac9 100644
--- a/app/dialogs/offset-dialog.c
+++ b/app/dialogs/offset-dialog.c
@@ -77,19 +77,19 @@ offset_dialog_new (GimpDrawable *drawable,
GimpContext *context,
GtkWidget *parent)
{
- GimpItem *item;
- OffsetDialog *dialog;
- GtkWidget *main_vbox;
- GtkWidget *vbox;
- GtkWidget *hbox;
- GtkWidget *button;
- GtkWidget *spinbutton;
- GtkWidget *frame;
- GtkWidget *radio_button;
- GtkObject *adjustment;
- gdouble xres;
- gdouble yres;
- const gchar *title = NULL;
+ GimpItem *item;
+ OffsetDialog *dialog;
+ GtkWidget *main_vbox;
+ GtkWidget *vbox;
+ GtkWidget *hbox;
+ GtkWidget *button;
+ GtkWidget *spinbutton;
+ GtkWidget *frame;
+ GtkWidget *radio_button;
+ GtkAdjustment *adjustment;
+ gdouble xres;
+ gdouble yres;
+ const gchar *title = NULL;
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
diff --git a/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c
index 9cdd554..d162cfb 100644
--- a/app/dialogs/palette-import-dialog.c
+++ b/app/dialogs/palette-import-dialog.c
@@ -320,12 +320,11 @@ palette_import_dialog_new (GimpContext *context)
dialog->entry, 2, FALSE);
/* The # of colors */
- dialog->num_colors =
- GTK_ADJUSTMENT (gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
- _("N_umber of colors:"), -1, 5,
- 256, 2, 10000, 1, 10, 0,
- TRUE, 0.0, 0.0,
- NULL, NULL));
+ dialog->num_colors = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
+ _("N_umber of colors:"), -1, 5,
+ 256, 2, 10000, 1, 10, 0,
+ TRUE, 0.0, 0.0,
+ NULL, NULL);
g_signal_connect_swapped (dialog->num_colors,
"value-changed",
@@ -333,24 +332,22 @@ palette_import_dialog_new (GimpContext *context)
dialog);
/* The columns */
- dialog->columns =
- GTK_ADJUSTMENT (gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
+ dialog->columns = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
_("C_olumns:"), -1, 5,
16, 0, 64, 1, 8, 0,
TRUE, 0.0, 0.0,
- NULL, NULL));
+ NULL, NULL);
g_signal_connect (dialog->columns, "value-changed",
G_CALLBACK (palette_import_columns_changed),
dialog);
/* The interval */
- dialog->threshold =
- GTK_ADJUSTMENT (gimp_scale_entry_new (GTK_TABLE (table), 0, 3,
- _("I_nterval:"), -1, 5,
- 1, 1, 128, 1, 8, 0,
- TRUE, 0.0, 0.0,
- NULL, NULL));
+ dialog->threshold = gimp_scale_entry_new (GTK_TABLE (table), 0, 3,
+ _("I_nterval:"), -1, 5,
+ 1, 1, 128, 1, 8, 0,
+ TRUE, 0.0, 0.0,
+ NULL, NULL);
g_signal_connect_swapped (dialog->threshold, "value-changed",
G_CALLBACK (palette_import_make_palette),
@@ -522,10 +519,8 @@ palette_import_image_changed (GimpContext *context,
gtk_widget_set_sensitive (dialog->sample_merged_toggle, sensitive);
gtk_widget_set_sensitive (dialog->selection_only_toggle, sensitive);
- gimp_scale_entry_set_sensitive (GTK_OBJECT (dialog->threshold),
- sensitive);
- gimp_scale_entry_set_sensitive (GTK_OBJECT (dialog->num_colors),
- sensitive);
+ gimp_scale_entry_set_sensitive (dialog->threshold, sensitive);
+ gimp_scale_entry_set_sensitive (dialog->num_colors, sensitive);
}
if (dialog->image)
@@ -635,9 +630,9 @@ palette_import_set_sensitive (ImportDialog *dialog)
gtk_widget_set_sensitive (dialog->selection_only_toggle, image);
gtk_widget_set_sensitive (dialog->file_chooser, file);
- gimp_scale_entry_set_sensitive (GTK_OBJECT (dialog->num_colors), ! file);
- gimp_scale_entry_set_sensitive (GTK_OBJECT (dialog->columns), ! file);
- gimp_scale_entry_set_sensitive (GTK_OBJECT (dialog->threshold), image);
+ gimp_scale_entry_set_sensitive (dialog->num_colors, ! file);
+ gimp_scale_entry_set_sensitive (dialog->columns, ! file);
+ gimp_scale_entry_set_sensitive (dialog->threshold, image);
}
static void
diff --git a/app/dialogs/print-size-dialog.c b/app/dialogs/print-size-dialog.c
index d8c7290..083bf77 100644
--- a/app/dialogs/print-size-dialog.c
+++ b/app/dialogs/print-size-dialog.c
@@ -93,7 +93,7 @@ print_size_dialog_new (GimpImage *image,
GtkWidget *height;
GtkWidget *hbox;
GtkWidget *chain;
- GtkObject *adj;
+ GtkAdjustment *adj;
GList *focus_chain = NULL;
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
diff --git a/app/dialogs/resize-dialog.c b/app/dialogs/resize-dialog.c
index cc6087a..9f4db14 100644
--- a/app/dialogs/resize-dialog.c
+++ b/app/dialogs/resize-dialog.c
@@ -89,21 +89,21 @@ resize_dialog_new (GimpViewable *viewable,
GimpResizeCallback callback,
gpointer user_data)
{
- GtkWidget *dialog;
- GtkWidget *main_vbox;
- GtkWidget *vbox;
- GtkWidget *abox;
- GtkWidget *frame;
- GtkWidget *button;
- GtkWidget *spinbutton;
- GtkWidget *entry;
- GtkObject *adjustment;
- GdkPixbuf *pixbuf;
- ResizeDialog *private;
- GimpImage *image = NULL;
- const gchar *text = NULL;
- gint width, height;
- gdouble xres, yres;
+ GtkWidget *dialog;
+ GtkWidget *main_vbox;
+ GtkWidget *vbox;
+ GtkWidget *abox;
+ GtkWidget *frame;
+ GtkWidget *button;
+ GtkWidget *spinbutton;
+ GtkWidget *entry;
+ GtkAdjustment *adjustment;
+ GdkPixbuf *pixbuf;
+ ResizeDialog *private;
+ GimpImage *image = NULL;
+ const gchar *text = NULL;
+ gint width, height;
+ gdouble xres, yres;
g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), NULL);
g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]