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



commit 3b4e6490ccf0936f85c6cd37faa82ce61cb81fae
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/blinds.c           |   22 +++++-----
 plug-ins/common/cartoon.c          |   12 +++---
 plug-ins/common/cml-explorer.c     |   79 ++++++++++++++++++------------------
 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/edge-neon.c        |   12 +++---
 plug-ins/common/emboss.c           |   18 ++++----
 plug-ins/common/file-csource.c     |   18 ++++----
 12 files changed, 120 insertions(+), 121 deletions(-)
---
diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c
index 03d6530..e842c7f 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/cartoon.c b/plug-ins/common/cartoon.c
index 1ecd723..dd6c5b4 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 de681fe..1478d42 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);
@@ -1308,13 +1308,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);
@@ -1548,13 +1548,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);
@@ -1705,15 +1705,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);
@@ -2444,9 +2443,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),
@@ -2477,9 +2476,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/colormap-remap.c b/plug-ins/common/colormap-remap.c
index 30cf610..6ee8d83 100644
--- a/plug-ins/common/colormap-remap.c
+++ b/plug-ins/common/colormap-remap.c
@@ -682,8 +682,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 92dafc6..9cad164 100644
--- a/plug-ins/common/compose.c
+++ b/plug-ins/common/compose.c
@@ -1155,13 +1155,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 da39bc6..64fa150 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 043e99b..d6ae8c5 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 eed7167..7d1a001 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 81d5bf3..efff865 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/edge-neon.c b/plug-ins/common/edge-neon.c
index bd36b7d..4d47644 100644
--- a/plug-ins/common/edge-neon.c
+++ b/plug-ins/common/edge-neon.c
@@ -684,12 +684,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/emboss.c b/plug-ins/common/emboss.c
index 51ec60e..a634e7b 100644
--- a/plug-ins/common/emboss.c
+++ b/plug-ins/common/emboss.c
@@ -434,15 +434,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/file-csource.c b/plug-ins/common/file-csource.c
index 80eb50d..97b50ec 100644
--- a/plug-ins/common/file-csource.c
+++ b/plug-ins/common/file-csource.c
@@ -873,15 +873,15 @@ 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 *alpha_toggle;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *vbox;
+  GtkWidget     *table;
+  GtkWidget     *prefixed_name;
+  GtkWidget     *centry;
+  GtkWidget     *toggle;
+  GtkWidget     *alpha_toggle;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   dialog = gimp_export_dialog_new (_("C-Source"), PLUG_IN_BINARY, SAVE_PROC);
 


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