[gimp/gtk3-port: 25/226] app: s/GtkObject/GtkAdjustment/
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 25/226] app: s/GtkObject/GtkAdjustment/
- Date: Sun, 29 Mar 2015 19:11:43 +0000 (UTC)
commit a319f28f6193913bb05e2a9a90cfc47c0198591d
Author: Michael Natterer <mitch gimp org>
Date: Fri Oct 15 14:28:56 2010 +0200
app: s/GtkObject/GtkAdjustment/
app/widgets/gimphistogrambox.c | 12 ++++--------
app/widgets/gimppaletteeditor.c | 3 +--
app/widgets/gimpscalebutton.c | 4 ++--
3 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/app/widgets/gimphistogrambox.c b/app/widgets/gimphistogrambox.c
index c2ecbc0..5e06359 100644
--- a/app/widgets/gimphistogrambox.c
+++ b/app/widgets/gimphistogrambox.c
@@ -141,8 +141,7 @@ gimp_histogram_box_init (GimpHistogramBox *box)
gtk_widget_show (hbox);
/* low spinbutton */
- box->low_adj = (GtkAdjustment *)
- gtk_adjustment_new (0.0, 0.0, 255.0, 1.0, 16.0, 0.0);
+ box->low_adj = gtk_adjustment_new (0.0, 0.0, 255.0, 1.0, 16.0, 0.0);
box->low_spinbutton = gtk_spin_button_new (box->low_adj, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (box->low_spinbutton), TRUE);
gtk_box_pack_start (GTK_BOX (hbox), box->low_spinbutton, FALSE, FALSE, 0);
@@ -152,12 +151,10 @@ gimp_histogram_box_init (GimpHistogramBox *box)
G_CALLBACK (gimp_histogram_box_low_adj_update),
box);
- gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (bar), 0,
- GTK_ADJUSTMENT (box->low_adj));
+ gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (bar), 0, box->low_adj);
/* high spinbutton */
- box->high_adj = (GtkAdjustment *)
- gtk_adjustment_new (255.0, 0.0, 255.0, 1.0, 16.0, 0.0);
+ box->high_adj = gtk_adjustment_new (255.0, 0.0, 255.0, 1.0, 16.0, 0.0);
box->high_spinbutton = gtk_spin_button_new (box->high_adj, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (box->high_spinbutton), TRUE);
gtk_box_pack_end (GTK_BOX (hbox), box->high_spinbutton, FALSE, FALSE, 0);
@@ -167,8 +164,7 @@ gimp_histogram_box_init (GimpHistogramBox *box)
G_CALLBACK (gimp_histogram_box_high_adj_update),
box);
- gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (bar), 2,
- GTK_ADJUSTMENT (box->high_adj));
+ gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (bar), 2, box->high_adj);
#ifdef DEBUG_VIEW
spinbutton = gimp_prop_spin_button_new (G_OBJECT (box->view), "border-width",
diff --git a/app/widgets/gimppaletteeditor.c b/app/widgets/gimppaletteeditor.c
index a918cc0..f22fe76 100644
--- a/app/widgets/gimppaletteeditor.c
+++ b/app/widgets/gimppaletteeditor.c
@@ -249,8 +249,7 @@ gimp_palette_editor_init (GimpPaletteEditor *editor)
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
- editor->columns_adj = (GtkAdjustment *)
- gtk_adjustment_new (0, 0, 64, 1, 4, 0);
+ editor->columns_adj = gtk_adjustment_new (0, 0, 64, 1, 4, 0);
spinbutton = gtk_spin_button_new (editor->columns_adj, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
diff --git a/app/widgets/gimpscalebutton.c b/app/widgets/gimpscalebutton.c
index 5c68fb7..e19f6c9 100644
--- a/app/widgets/gimpscalebutton.c
+++ b/app/widgets/gimpscalebutton.c
@@ -186,8 +186,8 @@ gimp_scale_button_new (gdouble value,
gdouble min,
gdouble max)
{
- GtkObject *adj;
- gdouble step;
+ GtkAdjustment *adj;
+ gdouble step;
g_return_val_if_fail (value >= min && value <= max, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]