[gimp/gtk3-port: 40/228] app: port tools to GTK+ 3.0 (trivial changes only)
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 40/228] app: port tools to GTK+ 3.0 (trivial changes only)
- Date: Sun, 6 Jan 2013 14:48:57 +0000 (UTC)
commit 0d34a71f3ee50c4bddebe9d432541330484ac412
Author: Michael Natterer <mitch gimp org>
Date: Tue Oct 19 13:01:44 2010 +0200
app: port tools to GTK+ 3.0 (trivial changes only)
app/tools/gimpbrightnesscontrasttool.c | 4 ++--
app/tools/gimpcolorbalancetool.c | 2 +-
app/tools/gimpcolorizetool.c | 8 ++++----
app/tools/gimphuesaturationtool.c | 10 +++++-----
app/tools/gimplevelstool.c | 15 +++++++--------
app/tools/gimpposterizetool.c | 4 ++--
app/tools/gimprotatetool.c | 4 ++--
app/tools/gimpsheartool.c | 4 ++--
app/tools/gimptexttool-editor.c | 7 ++++---
9 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/app/tools/gimpbrightnesscontrasttool.c b/app/tools/gimpbrightnesscontrasttool.c
index ab4d7ee..dbc6a47 100644
--- a/app/tools/gimpbrightnesscontrasttool.c
+++ b/app/tools/gimpbrightnesscontrasttool.c
@@ -250,7 +250,7 @@ gimp_brightness_contrast_tool_dialog (GimpImageMapTool *image_map_tool)
GtkWidget *main_vbox;
GtkWidget *table;
GtkWidget *button;
- GtkObject *data;
+ GtkAdjustment *data;
bc_tool = GIMP_BRIGHTNESS_CONTRAST_TOOL (image_map_tool);
config = bc_tool->config;
@@ -271,7 +271,7 @@ gimp_brightness_contrast_tool_dialog (GimpImageMapTool *image_map_tool)
-127.0, 127.0, 1.0, 10.0, 0,
TRUE, 0.0, 0.0,
NULL, NULL);
- bc_tool->brightness_data = GTK_ADJUSTMENT (data);
+ bc_tool->brightness_data = data;
g_signal_connect (data, "value-changed",
G_CALLBACK (brightness_contrast_brightness_changed),
diff --git a/app/tools/gimpcolorbalancetool.c b/app/tools/gimpcolorbalancetool.c
index a9668d0..1514904 100644
--- a/app/tools/gimpcolorbalancetool.c
+++ b/app/tools/gimpcolorbalancetool.c
@@ -190,7 +190,7 @@ create_levels_scale (gdouble value,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
- spinbutton = gimp_spin_button_new ((GtkObject **) &adj,
+ spinbutton = gimp_spin_button_new (&adj,
value, -100.0, 100.0,
1.0, 10.0, 0.0, 1.0, 0);
diff --git a/app/tools/gimpcolorizetool.c b/app/tools/gimpcolorizetool.c
index 70e0a0f..88343e3 100644
--- a/app/tools/gimpcolorizetool.c
+++ b/app/tools/gimpcolorizetool.c
@@ -193,7 +193,7 @@ gimp_colorize_tool_dialog (GimpImageMapTool *image_map_tool)
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *button;
- GtkObject *data;
+ GtkAdjustment *data;
GimpRGB color;
main_vbox = gimp_image_map_tool_dialog_get_vbox (image_map_tool);
@@ -220,7 +220,7 @@ gimp_colorize_tool_dialog (GimpImageMapTool *image_map_tool)
0.0, 359.99, 1.0, 15.0, 0,
TRUE, 0.0, 0.0,
NULL, NULL);
- col_tool->hue_data = GTK_ADJUSTMENT (data);
+ col_tool->hue_data = data;
g_signal_connect (data, "value-changed",
G_CALLBACK (colorize_hue_changed),
@@ -233,7 +233,7 @@ gimp_colorize_tool_dialog (GimpImageMapTool *image_map_tool)
0.0, 100.0, 1.0, 10.0, 0,
TRUE, 0.0, 0.0,
NULL, NULL);
- col_tool->saturation_data = GTK_ADJUSTMENT (data);
+ col_tool->saturation_data = data;
g_signal_connect (data, "value-changed",
G_CALLBACK (colorize_saturation_changed),
@@ -246,7 +246,7 @@ gimp_colorize_tool_dialog (GimpImageMapTool *image_map_tool)
-100.0, 100.0, 1.0, 10.0, 0,
TRUE, 0.0, 0.0,
NULL, NULL);
- col_tool->lightness_data = GTK_ADJUSTMENT (data);
+ col_tool->lightness_data = data;
g_signal_connect (data, "value-changed",
G_CALLBACK (colorize_lightness_changed),
diff --git a/app/tools/gimphuesaturationtool.c b/app/tools/gimphuesaturationtool.c
index c3c5ae1..2bcc0e2 100644
--- a/app/tools/gimphuesaturationtool.c
+++ b/app/tools/gimphuesaturationtool.c
@@ -192,7 +192,7 @@ gimp_hue_saturation_tool_dialog (GimpImageMapTool *image_map_tool)
GtkWidget *button;
GtkWidget *frame;
GtkWidget *hbox;
- GtkObject *data;
+ GtkAdjustment *data;
GtkSizeGroup *label_group;
GtkSizeGroup *spinner_group;
GSList *group = NULL;
@@ -315,7 +315,7 @@ gimp_hue_saturation_tool_dialog (GimpImageMapTool *image_map_tool)
0.0, 100.0, 1.0, 15.0, 0,
TRUE, 0.0, 0.0,
NULL, NULL);
- hs_tool->overlap_data = GTK_ADJUSTMENT (data);
+ hs_tool->overlap_data = data;
gtk_size_group_add_widget (label_group, GIMP_SCALE_ENTRY_LABEL (data));
gtk_size_group_add_widget (spinner_group, GIMP_SCALE_ENTRY_SPINBUTTON (data));
@@ -348,7 +348,7 @@ gimp_hue_saturation_tool_dialog (GimpImageMapTool *image_map_tool)
-180.0, 180.0, 1.0, 15.0, 0,
TRUE, 0.0, 0.0,
NULL, NULL);
- hs_tool->hue_data = GTK_ADJUSTMENT (data);
+ hs_tool->hue_data = data;
gtk_size_group_add_widget (label_group, GIMP_SCALE_ENTRY_LABEL (data));
gtk_size_group_add_widget (spinner_group, GIMP_SCALE_ENTRY_SPINBUTTON (data));
@@ -364,7 +364,7 @@ gimp_hue_saturation_tool_dialog (GimpImageMapTool *image_map_tool)
-100.0, 100.0, 1.0, 10.0, 0,
TRUE, 0.0, 0.0,
NULL, NULL);
- hs_tool->lightness_data = GTK_ADJUSTMENT (data);
+ hs_tool->lightness_data = data;
gtk_size_group_add_widget (label_group, GIMP_SCALE_ENTRY_LABEL (data));
gtk_size_group_add_widget (spinner_group, GIMP_SCALE_ENTRY_SPINBUTTON (data));
@@ -380,7 +380,7 @@ gimp_hue_saturation_tool_dialog (GimpImageMapTool *image_map_tool)
-100.0, 100.0, 1.0, 10.0, 0,
TRUE, 0.0, 0.0,
NULL, NULL);
- hs_tool->saturation_data = GTK_ADJUSTMENT (data);
+ hs_tool->saturation_data = data;
gtk_size_group_add_widget (label_group, GIMP_SCALE_ENTRY_LABEL (data));
gtk_size_group_add_widget (spinner_group, GIMP_SCALE_ENTRY_SPINBUTTON (data));
diff --git a/app/tools/gimplevelstool.c b/app/tools/gimplevelstool.c
index 93aa994..908abd4 100644
--- a/app/tools/gimplevelstool.c
+++ b/app/tools/gimplevelstool.c
@@ -363,7 +363,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
GtkWidget *button;
GtkWidget *spinbutton;
GtkWidget *bar;
- GtkObject *data;
+ GtkAdjustment *data;
gint border;
g_signal_connect (image_map_tool->settings_box, "file-dialog-setup",
@@ -508,7 +508,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
gtk_widget_show (spinbutton);
tool->low_input_spinbutton = spinbutton;
- tool->low_input = GTK_ADJUSTMENT (data);
+ tool->low_input = data;
g_signal_connect (tool->low_input, "value-changed",
G_CALLBACK (levels_low_input_changed),
tool);
@@ -524,13 +524,12 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
gimp_help_set_help_data (spinbutton, _("Gamma"), NULL);
gtk_widget_show (spinbutton);
- tool->gamma = GTK_ADJUSTMENT (data);
+ tool->gamma = data;
g_signal_connect (tool->gamma, "value-changed",
G_CALLBACK (levels_gamma_changed),
tool);
- tool->gamma_linear = GTK_ADJUSTMENT (gtk_adjustment_new (127, 0, 255,
- 0.1, 1.0, 0.0));
+ tool->gamma_linear = gtk_adjustment_new (127, 0, 255, 0.1, 1.0, 0.0);
g_signal_connect (tool->gamma_linear, "value-changed",
G_CALLBACK (levels_linear_gamma_changed),
tool);
@@ -555,7 +554,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
gtk_widget_show (spinbutton);
tool->high_input_spinbutton = spinbutton;
- tool->high_input = GTK_ADJUSTMENT (data);
+ tool->high_input = data;
g_signal_connect (tool->high_input, "value-changed",
G_CALLBACK (levels_high_input_changed),
tool);
@@ -617,7 +616,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
gtk_widget_show (spinbutton);
tool->low_output_spinbutton = spinbutton;
- tool->low_output = GTK_ADJUSTMENT (data);
+ tool->low_output = data;
g_signal_connect (tool->low_output, "value-changed",
G_CALLBACK (levels_low_output_changed),
tool);
@@ -633,7 +632,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
gtk_widget_show (spinbutton);
tool->high_output_spinbutton = spinbutton;
- tool->high_output = GTK_ADJUSTMENT (data);
+ tool->high_output = data;
g_signal_connect (tool->high_output, "value-changed",
G_CALLBACK (levels_high_output_changed),
tool);
diff --git a/app/tools/gimpposterizetool.c b/app/tools/gimpposterizetool.c
index 8937599..6072c74 100644
--- a/app/tools/gimpposterizetool.c
+++ b/app/tools/gimpposterizetool.c
@@ -168,7 +168,7 @@ gimp_posterize_tool_dialog (GimpImageMapTool *image_map_tool)
GimpPosterizeTool *posterize_tool = GIMP_POSTERIZE_TOOL (image_map_tool);
GtkWidget *main_vbox;
GtkWidget *table;
- GtkObject *data;
+ GtkAdjustment *data;
main_vbox = gimp_image_map_tool_dialog_get_vbox (image_map_tool);
@@ -187,7 +187,7 @@ gimp_posterize_tool_dialog (GimpImageMapTool *image_map_tool)
gimp_scale_entry_set_logarithmic (data, TRUE);
- posterize_tool->levels_data = GTK_ADJUSTMENT (data);
+ posterize_tool->levels_data = data;
g_signal_connect (posterize_tool->levels_data, "value-changed",
G_CALLBACK (gimp_posterize_tool_levels_changed),
diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c
index 36d6c73..05ef0a0 100644
--- a/app/tools/gimprotatetool.c
+++ b/app/tools/gimprotatetool.c
@@ -173,7 +173,7 @@ gimp_rotate_tool_dialog (GimpTransformTool *tr_tool)
GtkWidget *table;
GtkWidget *button;
GtkWidget *scale;
- GtkObject *adj;
+ GtkAdjustment *adj;
table = gtk_table_new (4, 2, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 6);
@@ -184,7 +184,7 @@ gimp_rotate_tool_dialog (GimpTransformTool *tr_tool)
table, FALSE, FALSE, 0);
gtk_widget_show (table);
- button = gimp_spin_button_new ((GtkObject **) &rotate->angle_adj,
+ button = gimp_spin_button_new (&rotate->angle_adj,
0, -180, 180, 0.1, 15, 0, 2, 2);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (button), TRUE);
gtk_entry_set_width_chars (GTK_ENTRY (button), SB_WIDTH);
diff --git a/app/tools/gimpsheartool.c b/app/tools/gimpsheartool.c
index 2d9aa88..2581bb6 100644
--- a/app/tools/gimpsheartool.c
+++ b/app/tools/gimpsheartool.c
@@ -130,7 +130,7 @@ gimp_shear_tool_dialog (GimpTransformTool *tr_tool)
table, FALSE, FALSE, 0);
gtk_widget_show (table);
- button = gimp_spin_button_new ((GtkObject **) &shear->x_adj,
+ button = gimp_spin_button_new (&shear->x_adj,
0, -65536, 65536, 1, 15, 0, 1, 0);
gtk_entry_set_width_chars (GTK_ENTRY (button), SB_WIDTH);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Shear magnitude _X:"),
@@ -140,7 +140,7 @@ gimp_shear_tool_dialog (GimpTransformTool *tr_tool)
G_CALLBACK (shear_x_mag_changed),
tr_tool);
- button = gimp_spin_button_new ((GtkObject **) &shear->y_adj,
+ button = gimp_spin_button_new (&shear->y_adj,
0, -65536, 65536, 1, 15, 0, 1, 0);
gtk_entry_set_width_chars (GTK_ENTRY (button), SB_WIDTH);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Shear magnitude _Y:"),
diff --git a/app/tools/gimptexttool-editor.c b/app/tools/gimptexttool-editor.c
index c4e950e..3777ec4 100644
--- a/app/tools/gimptexttool-editor.c
+++ b/app/tools/gimptexttool-editor.c
@@ -206,7 +206,8 @@ gimp_text_tool_editor_position (GimpTextTool *text_tool)
GtkRequisition requisition;
gint x, y;
- gtk_widget_size_request (text_tool->style_overlay, &requisition);
+ gtk_widget_get_preferred_size (text_tool->style_overlay,
+ &requisition, NULL);
g_object_get (text_tool,
"x1", &x,
@@ -451,7 +452,7 @@ gimp_text_tool_editor_key_press (GimpTextTool *text_tool,
gimp_text_tool_ensure_proxy (text_tool);
- if (gtk_bindings_activate_event (GTK_OBJECT (text_tool->proxy_text_view),
+ if (gtk_bindings_activate_event (G_OBJECT (text_tool->proxy_text_view),
kevent))
{
GIMP_LOG (TEXT_EDITING, "binding handled event");
@@ -508,7 +509,7 @@ gimp_text_tool_editor_key_release (GimpTextTool *text_tool,
gimp_text_tool_ensure_proxy (text_tool);
- if (gtk_bindings_activate_event (GTK_OBJECT (text_tool->proxy_text_view),
+ if (gtk_bindings_activate_event (G_OBJECT (text_tool->proxy_text_view),
kevent))
{
GIMP_LOG (TEXT_EDITING, "binding handled event");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
