[gimp/gtk3-port: 111/140] plug-ins: lots of trivial GTK+ 3.0 porting



commit f7ebc6cae9f58a355678edbbf6ecf02ad2f93f84
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/blur-motion.c          |   36 +++++++-------
 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       |   50 ++++++++++----------
 plug-ins/common/colormap-remap.c       |    4 +-
 plug-ins/common/compose.c              |   14 +++---
 plug-ins/common/contrast-retinex.c     |   16 +++---
 plug-ins/common/cubism.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 ++++----
 plug-ins/common/file-mng.c             |   30 ++++++------
 25 files changed, 275 insertions(+), 278 deletions(-)
---
diff --git a/plug-ins/common/apply-canvas.c b/plug-ins/common/apply-canvas.c
index f11db63..a4dcade 100644
--- a/plug-ins/common/apply-canvas.c
+++ b/plug-ins/common/apply-canvas.c
@@ -1248,14 +1248,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 53d8d17..a91aba2 100644
--- a/plug-ins/common/blinds.c
+++ b/plug-ins/common/blinds.c
@@ -205,17 +205,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 47bd915..d53084e 100644
--- a/plug-ins/common/blur-gauss-selective.c
+++ b/plug-ins/common/blur-gauss-selective.c
@@ -218,13 +218,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/blur-motion.c b/plug-ins/common/blur-motion.c
index cfb4fff..6b0391c 100644
--- a/plug-ins/common/blur-motion.c
+++ b/plug-ins/common/blur-motion.c
@@ -124,11 +124,11 @@ static mblur_vals_t mbvals =
 };
 
 
-static GtkObject *length     = NULL;
-static GtkObject *angle      = NULL;
-static GtkWidget *center     = NULL;
-static GtkWidget *dir_button = NULL;
-static GtkWidget *preview    = NULL;
+static GtkAdjustment *length     = NULL;
+static GtkAdjustment *angle      = NULL;
+static GtkWidget     *center     = NULL;
+static GtkWidget     *dir_button = NULL;
+static GtkWidget     *preview    = NULL;
 
 static gint       img_width, img_height, img_bpp;
 static gboolean   has_alpha;
@@ -992,19 +992,19 @@ static gboolean
 mblur_dialog (gint32        image_ID,
               GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *hbox;
-  GtkWidget *vbox;
-  GtkWidget *frame;
-  GtkWidget *table;
-  GtkWidget *entry;
-  GtkWidget *spinbutton;
-  GtkWidget *label;
-  GtkWidget *button;
-  GtkObject *adj;
-  gdouble    xres, yres;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *hbox;
+  GtkWidget     *vbox;
+  GtkWidget     *frame;
+  GtkWidget     *table;
+  GtkWidget     *entry;
+  GtkWidget     *spinbutton;
+  GtkWidget     *label;
+  GtkWidget     *button;
+  GtkAdjustment *adj;
+  gdouble        xres, yres;
+  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 67c93e0..ef3cca3 100644
--- a/plug-ins/common/bump-map.c
+++ b/plug-ins/common/bump-map.c
@@ -91,8 +91,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;
@@ -748,17 +748,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);
 
@@ -1063,8 +1063,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);
@@ -1073,8 +1072,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);
@@ -1133,7 +1131,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,
@@ -1145,7 +1143,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 d3069de..49462d5 100644
--- a/plug-ins/common/cartoon.c
+++ b/plug-ins/common/cartoon.c
@@ -798,12 +798,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 d42d22d..5601c4a 100644
--- a/plug-ins/common/cml-explorer.c
+++ b/plug-ins/common/cml-explorer.c
@@ -340,21 +340,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);
@@ -1304,13 +1304,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_vbox_new (FALSE, 12);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
@@ -1544,13 +1544,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);
@@ -1701,15 +1701,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_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
@@ -2440,9 +2439,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),
@@ -2473,9 +2472,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 803dfbb..402d8e6 100644
--- a/plug-ins/common/color-exchange.c
+++ b/plug-ins/common/color-exchange.c
@@ -268,19 +268,19 @@ 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;
-  GtkWidget    *scale;
-  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;
+  GtkWidget     *scale;
+  GtkAdjustment *adj;
+  GtkSizeGroup  *group;
+  gint           framenumber;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
@@ -616,16 +616,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);
@@ -639,14 +639,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)
         {
@@ -655,7 +655,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 9436a39..50496fb 100644
--- a/plug-ins/common/colormap-remap.c
+++ b/plug-ins/common/colormap-remap.c
@@ -661,8 +661,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 274404d..3d246e9 100644
--- a/plug-ins/common/compose.c
+++ b/plug-ins/common/compose.c
@@ -1564,13 +1564,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_hbox_new (FALSE, 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 6767a88..fa8328d 100644
--- a/plug-ins/common/contrast-retinex.c
+++ b/plug-ins/common/contrast-retinex.c
@@ -271,14 +271,14 @@ run (const gchar      *name,
 static gboolean
 retinex_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *table;
-  GtkWidget *combo;
-  GtkWidget *scale;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *table;
+  GtkWidget     *combo;
+  GtkWidget     *scale;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, FALSE);
 
diff --git a/plug-ins/common/cubism.c b/plug-ins/common/cubism.c
index face4fe..54f9b2d 100644
--- a/plug-ins/common/cubism.c
+++ b/plug-ins/common/cubism.c
@@ -254,13 +254,13 @@ run (const gchar      *name,
 static gboolean
 cubism_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *toggle;
-  GtkWidget *table;
-  GtkObject *scale_data;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *toggle;
+  GtkWidget     *table;
+  GtkAdjustment *scale_data;
+  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 1ba05fd..ff4a63b 100644
--- a/plug-ins/common/depth-merge.c
+++ b/plug-ins/common/depth-merge.c
@@ -626,15 +626,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 28f03c3..46af0a1 100644
--- a/plug-ins/common/despeckle.c
+++ b/plug-ins/common/despeckle.c
@@ -426,14 +426,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 dc5d693..b9ce441 100644
--- a/plug-ins/common/destripe.c
+++ b/plug-ins/common/destripe.c
@@ -424,13 +424,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 3787a77..6816fa9 100644
--- a/plug-ins/common/diffraction.c
+++ b/plug-ins/common/diffraction.c
@@ -417,16 +417,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 133a222..0dd40fa 100644
--- a/plug-ins/common/displace.c
+++ b/plug-ins/common/displace.c
@@ -307,18 +307,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);
 
@@ -845,7 +845,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 6e6632c..26950d8 100644
--- a/plug-ins/common/edge-neon.c
+++ b/plug-ins/common/edge-neon.c
@@ -682,12 +682,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 0aac14d..4ae724c 100644
--- a/plug-ins/common/edge.c
+++ b/plug-ins/common/edge.c
@@ -608,16 +608,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 c9ee2b6..48fcc8d 100644
--- a/plug-ins/common/emboss.c
+++ b/plug-ins/common/emboss.c
@@ -431,15 +431,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 eeaee31..d736ba1 100644
--- a/plug-ins/common/engrave.c
+++ b/plug-ins/common/engrave.c
@@ -195,13 +195,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 f3b18c8..42fa78a 100644
--- a/plug-ins/common/file-csource.c
+++ b/plug-ins/common/file-csource.c
@@ -690,16 +690,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 805b0b2..9a7460d 100644
--- a/plug-ins/common/file-gbr.c
+++ b/plug-ins/common/file-gbr.c
@@ -759,12 +759,12 @@ save_image (const gchar  *filename,
 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 e60a02b..2c054a1 100644
--- a/plug-ins/common/file-html-table.c
+++ b/plug-ins/common/file-html-table.c
@@ -393,16 +393,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);
 
diff --git a/plug-ins/common/file-mng.c b/plug-ins/common/file-mng.c
index bb390c7..03bb4fe 100644
--- a/plug-ins/common/file-mng.c
+++ b/plug-ins/common/file-mng.c
@@ -1267,21 +1267,21 @@ mng_save_image (const gchar  *filename,
 static gboolean
 mng_save_dialog (gint32 image_id)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *frame;
-  GtkWidget *vbox;
-  GtkWidget *table;
-  GtkWidget *toggle;
-  GtkWidget *hbox;
-  GtkWidget *combo;
-  GtkWidget *label;
-  GtkWidget *scale;
-  GtkObject *scale_adj;
-  GtkWidget *spinbutton;
-  GtkObject *spinbutton_adj;
-  gint       num_layers;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *frame;
+  GtkWidget     *vbox;
+  GtkWidget     *table;
+  GtkWidget     *toggle;
+  GtkWidget     *hbox;
+  GtkWidget     *combo;
+  GtkWidget     *label;
+  GtkWidget     *scale;
+  GtkAdjustment *scale_adj;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *spinbutton_adj;
+  gint           num_layers;
+  gboolean       run;
 
   dialog = gimp_export_dialog_new (_("MNG"), PLUG_IN_BINARY, SAVE_PROC);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]