[gimp/gtk3-port: 78/227] plug-ins: lots of trivial GTK+ 3.0 porting
- From: Clayton Walker <claytonw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 78/227] plug-ins: lots of trivial GTK+ 3.0 porting
- Date: Mon, 21 Oct 2013 21:24:58 +0000 (UTC)
commit 52e79c8a7a7ad2fab4d57888894caf6d7d259f5a
Author: Michael Natterer <mitch gimp org>
Date: Fri Oct 22 20:31:20 2010 +0200
plug-ins: lots of trivial GTK+ 3.0 porting
Most of it simply s/GtkObject/GtkAdjustment/
plug-ins/common/apply-canvas.c | 16 +++---
plug-ins/common/blinds.c | 22 ++++----
plug-ins/common/blur-gauss-selective.c | 14 +++---
plug-ins/common/bump-map.c | 36 +++++++--------
plug-ins/common/cartoon.c | 12 ++--
plug-ins/common/cml-explorer.c | 79 ++++++++++++++++----------------
plug-ins/common/color-exchange.c | 48 ++++++++++----------
plug-ins/common/colormap-remap.c | 4 +-
plug-ins/common/compose.c | 14 +++---
plug-ins/common/contrast-retinex.c | 14 +++---
plug-ins/common/depth-merge.c | 18 ++++----
plug-ins/common/despeckle.c | 16 +++---
plug-ins/common/destripe.c | 14 +++---
plug-ins/common/diffraction.c | 20 ++++----
plug-ins/common/displace.c | 26 +++++-----
plug-ins/common/edge-neon.c | 12 ++--
plug-ins/common/edge.c | 20 ++++----
plug-ins/common/emboss.c | 18 ++++----
plug-ins/common/engrave.c | 14 +++---
plug-ins/common/file-csource.c | 20 ++++----
plug-ins/common/file-gbr.c | 12 ++--
plug-ins/common/file-html-table.c | 20 ++++----
22 files changed, 233 insertions(+), 236 deletions(-)
---
diff --git a/plug-ins/common/apply-canvas.c b/plug-ins/common/apply-canvas.c
index 73caf20..4d87919 100644
--- a/plug-ins/common/apply-canvas.c
+++ b/plug-ins/common/apply-canvas.c
@@ -1249,14 +1249,14 @@ run (const gchar *name,
static gboolean
struc_dialog (GimpDrawable *drawable)
{
- GtkWidget *dialog;
- GtkWidget *main_vbox;
- GtkWidget *preview;
- GtkWidget *frame;
- GtkWidget *table;
- GtkWidget *radio1, *radio2, *radio3, *radio4;
- GtkObject *adj;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *main_vbox;
+ GtkWidget *preview;
+ GtkWidget *frame;
+ GtkWidget *table;
+ GtkWidget *radio1, *radio2, *radio3, *radio4;
+ GtkAdjustment *adj;
+ gboolean run;
gimp_ui_init (PLUG_IN_BINARY, FALSE);
diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c
index e74b3b3..f9dadb0 100644
--- a/plug-ins/common/blinds.c
+++ b/plug-ins/common/blinds.c
@@ -204,17 +204,17 @@ run (const gchar *name,
static gboolean
blinds_dialog (GimpDrawable *drawable)
{
- GtkWidget *dialog;
- GtkWidget *main_vbox;
- GtkWidget *preview;
- GtkWidget *hbox;
- GtkWidget *frame;
- GtkWidget *table;
- GtkObject *size_data;
- GtkWidget *toggle;
- GtkWidget *horizontal;
- GtkWidget *vertical;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *main_vbox;
+ GtkWidget *preview;
+ GtkWidget *hbox;
+ GtkWidget *frame;
+ GtkWidget *table;
+ GtkAdjustment *size_data;
+ GtkWidget *toggle;
+ GtkWidget *horizontal;
+ GtkWidget *vertical;
+ gboolean run;
gimp_ui_init (PLUG_IN_BINARY, TRUE);
diff --git a/plug-ins/common/blur-gauss-selective.c b/plug-ins/common/blur-gauss-selective.c
index 5acf2d5..4df684e 100644
--- a/plug-ins/common/blur-gauss-selective.c
+++ b/plug-ins/common/blur-gauss-selective.c
@@ -219,13 +219,13 @@ run (const gchar *name,
static gboolean
sel_gauss_dialog (GimpDrawable *drawable)
{
- GtkWidget *dialog;
- GtkWidget *main_vbox;
- GtkWidget *preview;
- GtkWidget *table;
- GtkWidget *spinbutton;
- GtkObject *adj;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *main_vbox;
+ GtkWidget *preview;
+ GtkWidget *table;
+ GtkWidget *spinbutton;
+ GtkAdjustment *adj;
+ gboolean run;
gimp_ui_init (PLUG_IN_BINARY, FALSE);
diff --git a/plug-ins/common/bump-map.c b/plug-ins/common/bump-map.c
index 288755f..3710bd9 100644
--- a/plug-ins/common/bump-map.c
+++ b/plug-ins/common/bump-map.c
@@ -92,8 +92,8 @@ typedef struct
gint mouse_y;
gint drag_mode;
- GtkObject *offset_adj_x;
- GtkObject *offset_adj_y;
+ GtkAdjustment *offset_adj_x;
+ GtkAdjustment *offset_adj_y;
guchar **src_rows;
guchar **bm_rows;
@@ -754,17 +754,17 @@ bumpmap_convert_row (guchar *row,
static gboolean
bumpmap_dialog (void)
{
- GtkWidget *dialog;
- GtkWidget *paned;
- GtkWidget *hbox;
- GtkWidget *vbox;
- GtkWidget *preview;
- GtkWidget *table;
- GtkWidget *combo;
- GtkWidget *button;
- GtkObject *adj;
- gboolean run;
- gint row = 0;
+ GtkWidget *dialog;
+ GtkWidget *paned;
+ GtkWidget *hbox;
+ GtkWidget *vbox;
+ GtkWidget *preview;
+ GtkWidget *table;
+ GtkWidget *combo;
+ GtkWidget *button;
+ GtkAdjustment *adj;
+ gboolean run;
+ gint row = 0;
gimp_ui_init (PLUG_IN_BINARY, TRUE);
@@ -1069,8 +1069,7 @@ dialog_preview_events (GtkWidget *area,
g_signal_handlers_block_by_func (bmint.offset_adj_x,
gimp_int_adjustment_update,
&bmvals.xofs);
- gtk_adjustment_set_value (GTK_ADJUSTMENT (bmint.offset_adj_x),
- bmvals.xofs);
+ gtk_adjustment_set_value (bmint.offset_adj_x, bmvals.xofs);
g_signal_handlers_unblock_by_func (bmint.offset_adj_x,
gimp_int_adjustment_update,
&bmvals.xofs);
@@ -1079,8 +1078,7 @@ dialog_preview_events (GtkWidget *area,
g_signal_handlers_block_by_func (bmint.offset_adj_y,
gimp_int_adjustment_update,
&bmvals.yofs);
- gtk_adjustment_set_value (GTK_ADJUSTMENT (bmint.offset_adj_y),
- bmvals.yofs);
+ gtk_adjustment_set_value (bmint.offset_adj_y, bmvals.yofs);
g_signal_handlers_unblock_by_func (bmint.offset_adj_y,
gimp_int_adjustment_update,
&bmvals.yofs);
@@ -1139,7 +1137,7 @@ dialog_new_bumpmap (gboolean init_offsets)
bmvals.xofs = draw_offset_x - bump_offset_x;
bmvals.yofs = draw_offset_y - bump_offset_y;
- adj = (GtkAdjustment *) bmint.offset_adj_x;
+ adj = bmint.offset_adj_x;
if (adj)
{
g_signal_handlers_block_by_func (adj,
@@ -1151,7 +1149,7 @@ dialog_new_bumpmap (gboolean init_offsets)
&bmvals.xofs);
}
- adj = (GtkAdjustment *) bmint.offset_adj_y;
+ adj = bmint.offset_adj_y;
if (adj)
{
g_signal_handlers_block_by_func (adj,
diff --git a/plug-ins/common/cartoon.c b/plug-ins/common/cartoon.c
index 2d55ba3..90e2559 100644
--- a/plug-ins/common/cartoon.c
+++ b/plug-ins/common/cartoon.c
@@ -797,12 +797,12 @@ find_constants (gdouble n_p[],
static gboolean
cartoon_dialog (GimpDrawable *drawable)
{
- GtkWidget *dialog;
- GtkWidget *main_vbox;
- GtkWidget *preview;
- GtkWidget *table;
- GtkObject *scale_data;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *main_vbox;
+ GtkWidget *preview;
+ GtkWidget *table;
+ GtkAdjustment *scale_data;
+ gboolean run;
gimp_ui_init (PLUG_IN_BINARY, FALSE);
diff --git a/plug-ins/common/cml-explorer.c b/plug-ins/common/cml-explorer.c
index 4dbeec6..b629c19 100644
--- a/plug-ins/common/cml-explorer.c
+++ b/plug-ins/common/cml-explorer.c
@@ -341,21 +341,21 @@ static gdouble logistic_function (CML_PARAM *param,
static gint CML_explorer_dialog (void);
-static GtkWidget * CML_dialog_channel_panel_new (CML_PARAM *param,
- gint channel_id);
+static GtkWidget * CML_dialog_channel_panel_new (CML_PARAM *param,
+ gint channel_id);
static GtkWidget * CML_dialog_advanced_panel_new (void);
-static void CML_explorer_toggle_entry_init (WidgetEntry *widget_entry,
- GtkWidget *widget,
- gpointer value_ptr);
+static void CML_explorer_toggle_entry_init (WidgetEntry *widget_entry,
+ GtkWidget *widget,
+ gpointer value_ptr);
-static void CML_explorer_int_entry_init (WidgetEntry *widget_entry,
- GtkObject *object,
- gpointer value_ptr);
+static void CML_explorer_int_entry_init (WidgetEntry *widget_entry,
+ GtkAdjustment *object,
+ gpointer value_ptr);
-static void CML_explorer_double_entry_init (WidgetEntry *widget_entry,
- GtkObject *object,
- gpointer value_ptr);
+static void CML_explorer_double_entry_init (WidgetEntry *widget_entry,
+ GtkAdjustment *object,
+ gpointer value_ptr);
static void CML_explorer_menu_update (GtkWidget *widget,
gpointer data);
@@ -1305,13 +1305,13 @@ CML_explorer_dialog (void)
gtk_label_new_with_mnemonic (_("_Advanced")));
{
- GtkSizeGroup *group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- GtkWidget *table;
- GtkWidget *label;
- GtkWidget *combo;
- GtkWidget *frame;
- GtkWidget *vbox;
- GtkObject *adj;
+ GtkSizeGroup *group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+ GtkWidget *table;
+ GtkWidget *label;
+ GtkWidget *combo;
+ GtkWidget *frame;
+ GtkWidget *vbox;
+ GtkAdjustment *adj;
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
@@ -1545,13 +1545,13 @@ static GtkWidget *
CML_dialog_channel_panel_new (CML_PARAM *param,
gint channel_id)
{
- GtkWidget *table;
- GtkWidget *combo;
- GtkWidget *toggle;
- GtkWidget *button;
- GtkObject *adj;
- gpointer *chank;
- gint index = 0;
+ GtkWidget *table;
+ GtkWidget *combo;
+ GtkWidget *toggle;
+ GtkWidget *button;
+ GtkAdjustment *adj;
+ gpointer *chank;
+ gint index = 0;
table = gtk_table_new (13, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
@@ -1702,15 +1702,14 @@ CML_dialog_channel_panel_new (CML_PARAM *param,
static GtkWidget *
CML_dialog_advanced_panel_new (void)
{
- GtkWidget *vbox;
- GtkWidget *subframe;
- GtkWidget *table;
- GtkObject *adj;
-
- gint index = 0;
- gint widget_offset = 12;
- gint channel_id;
- CML_PARAM *param;
+ GtkWidget *vbox;
+ GtkWidget *subframe;
+ GtkWidget *table;
+ GtkAdjustment *adj;
+ gint index = 0;
+ gint widget_offset = 12;
+ gint channel_id;
+ CML_PARAM *param;
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
@@ -2441,9 +2440,9 @@ CML_explorer_int_entry_change_value (WidgetEntry *widget_entry)
}
static void
-CML_explorer_int_entry_init (WidgetEntry *widget_entry,
- GtkObject *adjustment,
- gpointer value_ptr)
+CML_explorer_int_entry_init (WidgetEntry *widget_entry,
+ GtkAdjustment *adjustment,
+ gpointer value_ptr)
{
g_signal_connect (adjustment, "value-changed",
G_CALLBACK (CML_explorer_int_adjustment_update),
@@ -2474,9 +2473,9 @@ CML_explorer_double_entry_change_value (WidgetEntry *widget_entry)
}
static void
-CML_explorer_double_entry_init (WidgetEntry *widget_entry,
- GtkObject *adjustment,
- gpointer value_ptr)
+CML_explorer_double_entry_init (WidgetEntry *widget_entry,
+ GtkAdjustment *adjustment,
+ gpointer value_ptr)
{
g_signal_connect (adjustment, "value-changed",
G_CALLBACK (CML_explorer_double_adjustment_update),
diff --git a/plug-ins/common/color-exchange.c b/plug-ins/common/color-exchange.c
index 1135875..f583141 100644
--- a/plug-ins/common/color-exchange.c
+++ b/plug-ins/common/color-exchange.c
@@ -269,18 +269,18 @@ preview_event_handler (GtkWidget *area,
static gboolean
exchange_dialog (GimpDrawable *drawable)
{
- GtkWidget *dialog;
- GtkWidget *main_vbox;
- GtkWidget *hbox;
- GtkWidget *frame;
- GtkWidget *preview;
- GtkWidget *table;
- GtkWidget *threshold;
- GtkWidget *colorbutton;
- GtkObject *adj;
- GtkSizeGroup *group;
- gint framenumber;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *main_vbox;
+ GtkWidget *hbox;
+ GtkWidget *frame;
+ GtkWidget *preview;
+ GtkWidget *table;
+ GtkWidget *threshold;
+ GtkWidget *colorbutton;
+ GtkAdjustment *adj;
+ GtkSizeGroup *group;
+ gint framenumber;
+ gboolean run;
gimp_ui_init (PLUG_IN_BINARY, TRUE);
@@ -603,16 +603,16 @@ static void
color_button_callback (GtkWidget *widget,
gpointer data)
{
- GtkObject *red_adj;
- GtkObject *green_adj;
- GtkObject *blue_adj;
- GimpRGB *color;
+ GtkAdjustment *red_adj;
+ GtkAdjustment *green_adj;
+ GtkAdjustment *blue_adj;
+ GimpRGB *color;
color = (GimpRGB *) data;
- red_adj = (GtkObject *) g_object_get_data (G_OBJECT (widget), "red");
- green_adj = (GtkObject *) g_object_get_data (G_OBJECT (widget), "green");
- blue_adj = (GtkObject *) g_object_get_data (G_OBJECT (widget), "blue");
+ red_adj = g_object_get_data (G_OBJECT (widget), "red");
+ green_adj = g_object_get_data (G_OBJECT (widget), "green");
+ blue_adj = g_object_get_data (G_OBJECT (widget), "blue");
if (red_adj)
gtk_adjustment_set_value (GTK_ADJUSTMENT (red_adj), color->r);
@@ -626,14 +626,14 @@ static void
scale_callback (GtkAdjustment *adj,
gpointer data)
{
- GtkObject *object;
- GimpRGB *color;
+ GimpColorButton *button;
+ GimpRGB *color;
color = (GimpRGB *) data;
- object = g_object_get_data (G_OBJECT (adj), "colorbutton");
+ button = g_object_get_data (G_OBJECT (adj), "colorbutton");
- if (GIMP_IS_COLOR_BUTTON (object))
+ if (GIMP_IS_COLOR_BUTTON (button))
{
if (color == &xargs.threshold && lock_threshold == TRUE)
{
@@ -642,7 +642,7 @@ scale_callback (GtkAdjustment *adj,
gimp_rgb_set (color, value, value, value);
}
- gimp_color_button_set_color (GIMP_COLOR_BUTTON (object), color);
+ gimp_color_button_set_color (button, color);
}
}
diff --git a/plug-ins/common/colormap-remap.c b/plug-ins/common/colormap-remap.c
index b4fd71f..54b4152 100644
--- a/plug-ins/common/colormap-remap.c
+++ b/plug-ins/common/colormap-remap.c
@@ -662,8 +662,8 @@ remap_dialog (gint32 image_ID,
gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (iconview),
GTK_SELECTION_SINGLE);
- gtk_icon_view_set_orientation (GTK_ICON_VIEW (iconview),
- GTK_ORIENTATION_VERTICAL);
+ gtk_icon_view_set_item_orientation (GTK_ICON_VIEW (iconview),
+ GTK_ORIENTATION_VERTICAL);
gtk_icon_view_set_columns (GTK_ICON_VIEW (iconview), 16);
gtk_icon_view_set_row_spacing (GTK_ICON_VIEW (iconview), 0);
gtk_icon_view_set_column_spacing (GTK_ICON_VIEW (iconview), 0);
diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c
index 1c16194..a569678 100644
--- a/plug-ins/common/compose.c
+++ b/plug-ins/common/compose.c
@@ -1139,13 +1139,13 @@ compose_dialog (const gchar *compose_type,
for (j = 0; j < MAX_COMPOSE_IMAGES; j++)
{
- GtkWidget *image;
- GtkWidget *label;
- GtkWidget *combo;
- GtkObject *scale;
- GtkTreeIter iter;
- GtkTreeModel *model;
- GdkPixbuf *ico;
+ GtkWidget *image;
+ GtkWidget *label;
+ GtkWidget *combo;
+ GtkAdjustment *scale;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ GdkPixbuf *ico;
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, j, j + 1,
diff --git a/plug-ins/common/contrast-retinex.c b/plug-ins/common/contrast-retinex.c
index 7cc563f..74e2717 100644
--- a/plug-ins/common/contrast-retinex.c
+++ b/plug-ins/common/contrast-retinex.c
@@ -272,13 +272,13 @@ run (const gchar *name,
static gboolean
retinex_dialog (GimpDrawable *drawable)
{
- GtkWidget *dialog;
- GtkWidget *main_vbox;
- GtkWidget *preview;
- GtkWidget *table;
- GtkWidget *combo;
- GtkObject *adj;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *main_vbox;
+ GtkWidget *preview;
+ GtkWidget *table;
+ GtkWidget *combo;
+ GtkAdjustment *adj;
+ gboolean run;
gimp_ui_init (PLUG_IN_BINARY, FALSE);
diff --git a/plug-ins/common/depth-merge.c b/plug-ins/common/depth-merge.c
index 47ff729..4ad4b01 100644
--- a/plug-ins/common/depth-merge.c
+++ b/plug-ins/common/depth-merge.c
@@ -633,15 +633,15 @@ DepthMerge_executeRegion (DepthMerge *dm,
static gboolean
DepthMerge_dialog (DepthMerge *dm)
{
- GtkWidget *dialog;
- GtkWidget *vbox;
- GtkWidget *frame;
- GtkWidget *table;
- GtkWidget *hbox;
- GtkWidget *label;
- GtkWidget *combo;
- GtkObject *adj;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *vbox;
+ GtkWidget *frame;
+ GtkWidget *table;
+ GtkWidget *hbox;
+ GtkWidget *label;
+ GtkWidget *combo;
+ GtkAdjustment *adj;
+ gboolean run;
dm->interface = g_new0 (DepthMergeInterface, 1);
diff --git a/plug-ins/common/despeckle.c b/plug-ins/common/despeckle.c
index 8ced21d..23361fd 100644
--- a/plug-ins/common/despeckle.c
+++ b/plug-ins/common/despeckle.c
@@ -427,14 +427,14 @@ despeckle (void)
static gint
despeckle_dialog (void)
{
- GtkWidget *dialog;
- GtkWidget *main_vbox;
- GtkWidget *vbox;
- GtkWidget *table;
- GtkWidget *frame;
- GtkWidget *button;
- GtkObject *adj;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *main_vbox;
+ GtkWidget *vbox;
+ GtkWidget *table;
+ GtkWidget *frame;
+ GtkWidget *button;
+ GtkAdjustment *adj;
+ gboolean run;
gimp_ui_init (PLUG_IN_BINARY, TRUE);
diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c
index c0160cc..c1a9b5d 100644
--- a/plug-ins/common/destripe.c
+++ b/plug-ins/common/destripe.c
@@ -427,13 +427,13 @@ destripe (GimpDrawable *drawable,
static gboolean
destripe_dialog (GimpDrawable *drawable)
{
- GtkWidget *dialog;
- GtkWidget *main_vbox;
- GtkWidget *preview;
- GtkWidget *table;
- GtkWidget *button;
- GtkObject *adj;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *main_vbox;
+ GtkWidget *preview;
+ GtkWidget *table;
+ GtkWidget *button;
+ GtkAdjustment *adj;
+ gboolean run;
gimp_ui_init (PLUG_IN_BINARY, TRUE);
diff --git a/plug-ins/common/diffraction.c b/plug-ins/common/diffraction.c
index 04012cb..81ad9e9 100644
--- a/plug-ins/common/diffraction.c
+++ b/plug-ins/common/diffraction.c
@@ -421,16 +421,16 @@ diff_intensity (double x,
static gboolean
diffraction_dialog (void)
{
- GtkWidget *dialog;
- GtkWidget *hbox;
- GtkWidget *notebook;
- GtkWidget *frame;
- GtkWidget *vbox;
- GtkWidget *table;
- GtkWidget *label;
- GtkWidget *button;
- GtkObject *adj;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *hbox;
+ GtkWidget *notebook;
+ GtkWidget *frame;
+ GtkWidget *vbox;
+ GtkWidget *table;
+ GtkWidget *label;
+ GtkWidget *button;
+ GtkAdjustment *adj;
+ gboolean run;
gimp_ui_init (PLUG_IN_BINARY, TRUE);
diff --git a/plug-ins/common/displace.c b/plug-ins/common/displace.c
index d86aed8..622fdfa 100644
--- a/plug-ins/common/displace.c
+++ b/plug-ins/common/displace.c
@@ -308,18 +308,18 @@ run (const gchar *name,
static gboolean
displace_dialog (GimpDrawable *drawable)
{
- GtkWidget *dialog;
- GtkWidget *main_vbox;
- GtkWidget *table;
- GtkWidget *spinbutton;
- GtkObject *adj;
- GtkWidget *combo;
- GtkWidget *hbox;
- GtkWidget *frame;
- GtkWidget *wrap;
- GtkWidget *smear;
- GtkWidget *black;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *main_vbox;
+ GtkWidget *table;
+ GtkWidget *spinbutton;
+ GtkAdjustment *adj;
+ GtkWidget *combo;
+ GtkWidget *hbox;
+ GtkWidget *frame;
+ GtkWidget *wrap;
+ GtkWidget *smear;
+ GtkWidget *black;
+ gboolean run;
gimp_ui_init (PLUG_IN_BINARY, FALSE);
@@ -851,7 +851,7 @@ displace_get_label_size (void)
GtkRequisition requisition;
gtk_button_set_label (GTK_BUTTON (toggle_x), gettext (mtext[i][j]));
- gtk_widget_size_request (toggle_x, &requisition);
+ gtk_widget_get_preferred_size (toggle_x, &requisition, NULL);
if (requisition.width > label_maxwidth)
label_maxwidth = requisition.width;
diff --git a/plug-ins/common/edge-neon.c b/plug-ins/common/edge-neon.c
index 2f234a6..e8e2268 100644
--- a/plug-ins/common/edge-neon.c
+++ b/plug-ins/common/edge-neon.c
@@ -685,12 +685,12 @@ find_constants (gdouble n_p[],
static gboolean
neon_dialog (GimpDrawable *drawable)
{
- GtkWidget *dialog;
- GtkWidget *main_vbox;
- GtkWidget *preview;
- GtkWidget *table;
- GtkObject *scale_data;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *main_vbox;
+ GtkWidget *preview;
+ GtkWidget *table;
+ GtkAdjustment *scale_data;
+ gboolean run;
gimp_ui_init (PLUG_IN_BINARY, FALSE);
diff --git a/plug-ins/common/edge.c b/plug-ins/common/edge.c
index 1151ef0..88cd54f 100644
--- a/plug-ins/common/edge.c
+++ b/plug-ins/common/edge.c
@@ -603,16 +603,16 @@ laplace (const guchar *data)
static gboolean
edge_dialog (GimpDrawable *drawable)
{
- GtkWidget *dialog;
- GtkWidget *main_vbox;
- GtkWidget *preview;
- GtkWidget *hbox;
- GtkWidget *table;
- GtkWidget *combo;
- GtkWidget *toggle;
- GtkObject *scale_data;
- GSList *group = NULL;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *main_vbox;
+ GtkWidget *preview;
+ GtkWidget *hbox;
+ GtkWidget *table;
+ GtkWidget *combo;
+ GtkWidget *toggle;
+ GtkAdjustment *scale_data;
+ GSList *group = NULL;
+ gboolean run;
gboolean use_wrap = (evals.wrapmode == GIMP_PIXEL_FETCHER_EDGE_WRAP);
gboolean use_smear = (evals.wrapmode == GIMP_PIXEL_FETCHER_EDGE_SMEAR);
diff --git a/plug-ins/common/emboss.c b/plug-ins/common/emboss.c
index 0c0a608..f040682 100644
--- a/plug-ins/common/emboss.c
+++ b/plug-ins/common/emboss.c
@@ -432,15 +432,15 @@ emboss (GimpDrawable *drawable,
static gboolean
emboss_dialog (GimpDrawable *drawable)
{
- GtkWidget *dialog;
- GtkWidget *main_vbox;
- GtkWidget *preview;
- GtkWidget *radio1;
- GtkWidget *radio2;
- GtkWidget *frame;
- GtkWidget *table;
- GtkObject *adj;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *main_vbox;
+ GtkWidget *preview;
+ GtkWidget *radio1;
+ GtkWidget *radio2;
+ GtkWidget *frame;
+ GtkWidget *table;
+ GtkAdjustment *adj;
+ gboolean run;
gimp_ui_init (PLUG_IN_BINARY, TRUE);
diff --git a/plug-ins/common/engrave.c b/plug-ins/common/engrave.c
index 8b9307f..226917b 100644
--- a/plug-ins/common/engrave.c
+++ b/plug-ins/common/engrave.c
@@ -196,13 +196,13 @@ run (const gchar *name,
static gboolean
engrave_dialog (GimpDrawable *drawable)
{
- GtkWidget *dialog;
- GtkWidget *main_vbox;
- GtkWidget *preview;
- GtkWidget *table;
- GtkWidget *toggle;
- GtkObject *adj;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *main_vbox;
+ GtkWidget *preview;
+ GtkWidget *table;
+ GtkWidget *toggle;
+ GtkAdjustment *adj;
+ gboolean run;
gimp_ui_init (PLUG_IN_BINARY, FALSE);
diff --git a/plug-ins/common/file-csource.c b/plug-ins/common/file-csource.c
index ed8eabb..4033947 100644
--- a/plug-ins/common/file-csource.c
+++ b/plug-ins/common/file-csource.c
@@ -696,16 +696,16 @@ rgb565_toggle_button_update (GtkWidget *toggle,
static gboolean
run_save_dialog (Config *config)
{
- GtkWidget *dialog;
- GtkWidget *vbox;
- GtkWidget *table;
- GtkWidget *prefixed_name;
- GtkWidget *centry;
- GtkWidget *toggle;
- GtkWidget *rle_toggle;
- GtkWidget *alpha_toggle;
- GtkObject *adj;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *vbox;
+ GtkWidget *table;
+ GtkWidget *prefixed_name;
+ GtkWidget *centry;
+ GtkWidget *toggle;
+ GtkWidget *rle_toggle;
+ GtkWidget *alpha_toggle;
+ GtkAdjustment *adj;
+ gboolean run;
dialog = gimp_export_dialog_new (_("C-Source"), PLUG_IN_BINARY, SAVE_PROC);
diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c
index 082056f..24b3450 100644
--- a/plug-ins/common/file-gbr.c
+++ b/plug-ins/common/file-gbr.c
@@ -764,12 +764,12 @@ save_image (GFile *file,
static gboolean
save_dialog (void)
{
- GtkWidget *dialog;
- GtkWidget *table;
- GtkWidget *entry;
- GtkWidget *spinbutton;
- GtkObject *adj;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *table;
+ GtkWidget *entry;
+ GtkWidget *spinbutton;
+ GtkAdjustment *adj;
+ gboolean run;
dialog = gimp_export_dialog_new (_("Brush"), PLUG_IN_BINARY, SAVE_PROC);
diff --git a/plug-ins/common/file-html-table.c b/plug-ins/common/file-html-table.c
index e34e93f..40e83f5 100644
--- a/plug-ins/common/file-html-table.c
+++ b/plug-ins/common/file-html-table.c
@@ -397,16 +397,16 @@ save_image (const gchar *filename,
static gint
save_dialog (gint32 image_ID)
{
- GtkWidget *dialog;
- GtkWidget *main_vbox;
- GtkWidget *frame;
- GtkWidget *vbox;
- GtkWidget *table;
- GtkWidget *spinbutton;
- GtkObject *adj;
- GtkWidget *entry;
- GtkWidget *toggle;
- gboolean run;
+ GtkWidget *dialog;
+ GtkWidget *main_vbox;
+ GtkWidget *frame;
+ GtkWidget *vbox;
+ GtkWidget *table;
+ GtkWidget *spinbutton;
+ GtkAdjustment *adj;
+ GtkWidget *entry;
+ GtkWidget *toggle;
+ gboolean run;
gimp_ui_init (PLUG_IN_BINARY, FALSE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
