[gimp/gtk3-port: 25/228] app: s/GtkObject/GtkAdjustment/
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 25/228] app: s/GtkObject/GtkAdjustment/
- Date: Sun, 6 Jan 2013 14:47:41 +0000 (UTC)
commit cad4adb1c0b88fde8f6eb1dd457c313720b8192f
Author: Michael Natterer <mitch gimp org>
Date: Fri Oct 15 14:28:56 2010 +0200
app: s/GtkObject/GtkAdjustment/
app/widgets/gimphistogrambox.c | 17 ++++++-----------
app/widgets/gimppaletteeditor.c | 5 ++---
app/widgets/gimpscalebutton.c | 4 ++--
app/widgets/gimptemplateeditor.c | 2 +-
4 files changed, 11 insertions(+), 17 deletions(-)
---
diff --git a/app/widgets/gimphistogrambox.c b/app/widgets/gimphistogrambox.c
index 8273f4e..2452c64 100644
--- a/app/widgets/gimphistogrambox.c
+++ b/app/widgets/gimphistogrambox.c
@@ -76,7 +76,6 @@ gimp_histogram_box_init (GimpHistogramBox *box)
GtkWidget *vbox;
GtkWidget *vbox2;
GtkWidget *spinbutton;
- GtkObject *adjustment;
GtkWidget *frame;
GtkWidget *view;
GtkWidget *bar;
@@ -150,34 +149,30 @@ gimp_histogram_box_init (GimpHistogramBox *box)
gtk_widget_show (hbox);
/* low spinbutton */
- spinbutton = gimp_spin_button_new (&adjustment,
+ spinbutton = gimp_spin_button_new (&box->low_adj,
0.0, 0.0, 255.0, 1.0, 16.0, 0.0,
1.0, 0);
- box->low_adj = GTK_ADJUSTMENT (adjustment);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_widget_show (spinbutton);
- g_signal_connect (adjustment, "value-changed",
+ g_signal_connect (box->low_adj, "value-changed",
G_CALLBACK (gimp_histogram_box_low_adj_update),
box);
- gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (bar), 0,
- GTK_ADJUSTMENT (adjustment));
+ gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (bar), 0, box->low_adj);
/* high spinbutton */
- spinbutton = gimp_spin_button_new (&adjustment,
+ spinbutton = gimp_spin_button_new (&box->high_adj,
255.0, 0.0, 255.0, 1.0, 16.0, 0.0,
1.0, 0);
- box->high_adj = GTK_ADJUSTMENT (adjustment);
gtk_box_pack_end (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_widget_show (spinbutton);
- g_signal_connect (adjustment, "value-changed",
+ g_signal_connect (box->high_adj, "value-changed",
G_CALLBACK (gimp_histogram_box_high_adj_update),
box);
- gimp_handle_bar_set_adjustment (GIMP_HANDLE_BAR (bar), 2,
- GTK_ADJUSTMENT (adjustment));
+ 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 b74013e..86471b1 100644
--- a/app/widgets/gimppaletteeditor.c
+++ b/app/widgets/gimppaletteeditor.c
@@ -164,7 +164,6 @@ gimp_palette_editor_init (GimpPaletteEditor *editor)
GtkWidget *hbox;
GtkWidget *label;
GtkWidget *spinbutton;
- GtkObject *adj;
editor->zoom_factor = 1.0;
editor->col_width = 0;
@@ -236,8 +235,8 @@ gimp_palette_editor_init (GimpPaletteEditor *editor)
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
- spinbutton = gimp_spin_button_new (&adj, 0, 0, 64, 1, 4, 0, 1, 0);
- editor->columns_data = GTK_ADJUSTMENT (adj);
+ spinbutton = gimp_spin_button_new (&editor->columns_data,
+ 0, 0, 64, 1, 4, 0, 1, 0);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_widget_show (spinbutton);
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);
diff --git a/app/widgets/gimptemplateeditor.c b/app/widgets/gimptemplateeditor.c
index 95e38fb..c4cc3b3 100644
--- a/app/widgets/gimptemplateeditor.c
+++ b/app/widgets/gimptemplateeditor.c
@@ -135,7 +135,7 @@ gimp_template_editor_constructed (GObject *object)
GtkWidget *vbox;
GtkWidget *table;
GtkWidget *label;
- GtkObject *adjustment;
+ GtkAdjustment *adjustment;
GtkWidget *width;
GtkWidget *height;
GtkWidget *xres;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]