dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

plug-ins: lots of trivial GTK+ 3.0 porting 

Most of it simply s/GtkObject/GtkAdjustment/
This commit is contained in:
Michael Natterer 2010-10-22 20:31:20 +02:00
parent 1a82e4adce
commit 24924211f4
12 changed files with 120 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plug-ins/common/blinds.c
View File

@ -204,17 +204,17 @@ run (const gchar *name,
static gboolean static gboolean
blinds_dialog (GimpDrawable *drawable) blinds_dialog (GimpDrawable *drawable)
{ {
GtkWidget *dialog; GtkWidget *dialog;
GtkWidget *main_vbox; GtkWidget *main_vbox;
GtkWidget *preview; GtkWidget *preview;
GtkWidget *hbox; GtkWidget *hbox;
GtkWidget *frame; GtkWidget *frame;
GtkWidget *table; GtkWidget *table;
GtkObject *size_data; GtkAdjustment *size_data;
GtkWidget *toggle; GtkWidget *toggle;
GtkWidget *horizontal; GtkWidget *horizontal;
GtkWidget *vertical; GtkWidget *vertical;
gboolean run; gboolean run;
gimp_ui_init (PLUG_IN_BINARY, TRUE); gimp_ui_init (PLUG_IN_BINARY, TRUE);

12
plug-ins/common/cartoon.c
View File

@ -797,12 +797,12 @@ find_constants (gdouble n_p[],
static gboolean static gboolean
cartoon_dialog (GimpDrawable *drawable) cartoon_dialog (GimpDrawable *drawable)
{ {
GtkWidget *dialog; GtkWidget *dialog;
GtkWidget *main_vbox; GtkWidget *main_vbox;
GtkWidget *preview; GtkWidget *preview;
GtkWidget *table; GtkWidget *table;
GtkObject *scale_data; GtkAdjustment *scale_data;
gboolean run; gboolean run;
gimp_ui_init (PLUG_IN_BINARY, FALSE); gimp_ui_init (PLUG_IN_BINARY, FALSE);

79
plug-ins/common/cml-explorer.c
View File

@ -341,21 +341,21 @@ static gdouble logistic_function (CML_PARAM *param,
static gint CML_explorer_dialog (void); static gint CML_explorer_dialog (void);
static GtkWidget * CML_dialog_channel_panel_new (CML_PARAM *param, static GtkWidget * CML_dialog_channel_panel_new (CML_PARAM *param,
gint channel_id); gint channel_id);
static GtkWidget * CML_dialog_advanced_panel_new (void); static GtkWidget * CML_dialog_advanced_panel_new (void);
static void CML_explorer_toggle_entry_init (WidgetEntry *widget_entry, static void CML_explorer_toggle_entry_init (WidgetEntry *widget_entry,
GtkWidget *widget, GtkWidget *widget,
gpointer value_ptr); gpointer value_ptr);
static void CML_explorer_int_entry_init (WidgetEntry *widget_entry, static void CML_explorer_int_entry_init (WidgetEntry *widget_entry,
GtkObject *object, GtkAdjustment *object,
gpointer value_ptr); gpointer value_ptr);
static void CML_explorer_double_entry_init (WidgetEntry *widget_entry, static void CML_explorer_double_entry_init (WidgetEntry *widget_entry,
GtkObject *object, GtkAdjustment *object,
gpointer value_ptr); gpointer value_ptr);
static void CML_explorer_menu_update (GtkWidget *widget, static void CML_explorer_menu_update (GtkWidget *widget,
gpointer data); gpointer data);
@ -1308,13 +1308,13 @@ CML_explorer_dialog (void)
gtk_label_new_with_mnemonic (_("_Advanced"))); gtk_label_new_with_mnemonic (_("_Advanced")));
{ {
GtkSizeGroup *group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); GtkSizeGroup *group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
GtkWidget *table; GtkWidget *table;
GtkWidget *label; GtkWidget *label;
GtkWidget *combo; GtkWidget *combo;
GtkWidget *frame; GtkWidget *frame;
GtkWidget *vbox; GtkWidget *vbox;
GtkObject *adj; GtkAdjustment *adj;
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
@ -1548,13 +1548,13 @@ static GtkWidget *
CML_dialog_channel_panel_new (CML_PARAM *param, CML_dialog_channel_panel_new (CML_PARAM *param,
gint channel_id) gint channel_id)
{ {
GtkWidget *table; GtkWidget *table;
GtkWidget *combo; GtkWidget *combo;
GtkWidget *toggle; GtkWidget *toggle;
GtkWidget *button; GtkWidget *button;
GtkObject *adj; GtkAdjustment *adj;
gpointer *chank; gpointer *chank;
gint index = 0; gint index = 0;
table = gtk_table_new (13, 3, FALSE); table = gtk_table_new (13, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6);
@ -1705,15 +1705,14 @@ CML_dialog_channel_panel_new (CML_PARAM *param,
static GtkWidget * static GtkWidget *
CML_dialog_advanced_panel_new (void) CML_dialog_advanced_panel_new (void)
{ {
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *subframe; GtkWidget *subframe;
GtkWidget *table; GtkWidget *table;
GtkObject *adj; GtkAdjustment *adj;
gint index = 0;
gint index = 0; gint widget_offset = 12;
gint widget_offset = 12; gint channel_id;
gint channel_id; CML_PARAM *param;
CML_PARAM *param;
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 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 static void
CML_explorer_int_entry_init (WidgetEntry *widget_entry, CML_explorer_int_entry_init (WidgetEntry *widget_entry,
GtkObject *adjustment, GtkAdjustment *adjustment,
gpointer value_ptr) gpointer value_ptr)
{ {
g_signal_connect (adjustment, "value-changed", g_signal_connect (adjustment, "value-changed",
G_CALLBACK (CML_explorer_int_adjustment_update), G_CALLBACK (CML_explorer_int_adjustment_update),
@ -2477,9 +2476,9 @@ CML_explorer_double_entry_change_value (WidgetEntry *widget_entry)
} }
static void static void
CML_explorer_double_entry_init (WidgetEntry *widget_entry, CML_explorer_double_entry_init (WidgetEntry *widget_entry,
GtkObject *adjustment, GtkAdjustment *adjustment,
gpointer value_ptr) gpointer value_ptr)
{ {
g_signal_connect (adjustment, "value-changed", g_signal_connect (adjustment, "value-changed",
G_CALLBACK (CML_explorer_double_adjustment_update), G_CALLBACK (CML_explorer_double_adjustment_update),

4
plug-ins/common/colormap-remap.c
View File

@ -682,8 +682,8 @@ remap_dialog (gint32 image_ID,
gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (iconview), gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (iconview),
GTK_SELECTION_SINGLE); GTK_SELECTION_SINGLE);
gtk_icon_view_set_orientation (GTK_ICON_VIEW (iconview), gtk_icon_view_set_item_orientation (GTK_ICON_VIEW (iconview),
GTK_ORIENTATION_VERTICAL); GTK_ORIENTATION_VERTICAL);
gtk_icon_view_set_columns (GTK_ICON_VIEW (iconview), 16); 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_row_spacing (GTK_ICON_VIEW (iconview), 0);
gtk_icon_view_set_column_spacing (GTK_ICON_VIEW (iconview), 0); gtk_icon_view_set_column_spacing (GTK_ICON_VIEW (iconview), 0);

14
plug-ins/common/compose.c
View File

@ -1155,13 +1155,13 @@ compose_dialog (const gchar *compose_type,
for (j = 0; j < MAX_COMPOSE_IMAGES; j++) for (j = 0; j < MAX_COMPOSE_IMAGES; j++)
{ {
GtkWidget *image; GtkWidget *image;
GtkWidget *label; GtkWidget *label;
GtkWidget *combo; GtkWidget *combo;
GtkObject *scale; GtkAdjustment *scale;
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeModel *model; GtkTreeModel *model;
GdkPixbuf *ico; GdkPixbuf *ico;
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, j, j + 1, gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, j, j + 1,

14
plug-ins/common/contrast-retinex.c
View File

@ -272,13 +272,13 @@ run (const gchar *name,
static gboolean static gboolean
retinex_dialog (GimpDrawable *drawable) retinex_dialog (GimpDrawable *drawable)
{ {
GtkWidget *dialog; GtkWidget *dialog;
GtkWidget *main_vbox; GtkWidget *main_vbox;
GtkWidget *preview; GtkWidget *preview;
GtkWidget *table; GtkWidget *table;
GtkWidget *combo; GtkWidget *combo;
GtkObject *adj; GtkAdjustment *adj;
gboolean run; gboolean run;
gimp_ui_init (PLUG_IN_BINARY, FALSE); gimp_ui_init (PLUG_IN_BINARY, FALSE);

18
plug-ins/common/depth-merge.c
View File

@ -633,15 +633,15 @@ DepthMerge_executeRegion (DepthMerge *dm,
static gboolean static gboolean
DepthMerge_dialog (DepthMerge *dm) DepthMerge_dialog (DepthMerge *dm)
{ {
GtkWidget *dialog; GtkWidget *dialog;
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *frame; GtkWidget *frame;
GtkWidget *table; GtkWidget *table;
GtkWidget *hbox; GtkWidget *hbox;
GtkWidget *label; GtkWidget *label;
GtkWidget *combo; GtkWidget *combo;
GtkObject *adj; GtkAdjustment *adj;
gboolean run; gboolean run;
dm->interface = g_new0 (DepthMergeInterface, 1); dm->interface = g_new0 (DepthMergeInterface, 1);

16
plug-ins/common/despeckle.c
View File

@ -427,14 +427,14 @@ despeckle (void)
static gint static gint
despeckle_dialog (void) despeckle_dialog (void)
{ {
GtkWidget *dialog; GtkWidget *dialog;
GtkWidget *main_vbox; GtkWidget *main_vbox;
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *table; GtkWidget *table;
GtkWidget *frame; GtkWidget *frame;
GtkWidget *button; GtkWidget *button;
GtkObject *adj; GtkAdjustment *adj;
gboolean run; gboolean run;
gimp_ui_init (PLUG_IN_BINARY, TRUE); gimp_ui_init (PLUG_IN_BINARY, TRUE);

14
plug-ins/common/destripe.c
View File

@ -427,13 +427,13 @@ destripe (GimpDrawable *drawable,
static gboolean static gboolean
destripe_dialog (GimpDrawable *drawable) destripe_dialog (GimpDrawable *drawable)
{ {
GtkWidget *dialog; GtkWidget *dialog;
GtkWidget *main_vbox; GtkWidget *main_vbox;
GtkWidget *preview; GtkWidget *preview;
GtkWidget *table; GtkWidget *table;
GtkWidget *button; GtkWidget *button;
GtkObject *adj; GtkAdjustment *adj;
gboolean run; gboolean run;
gimp_ui_init (PLUG_IN_BINARY, TRUE); gimp_ui_init (PLUG_IN_BINARY, TRUE);

12
plug-ins/common/edge-neon.c
View File

@ -684,12 +684,12 @@ find_constants (gdouble n_p[],
static gboolean static gboolean
neon_dialog (GimpDrawable *drawable) neon_dialog (GimpDrawable *drawable)
{ {
GtkWidget *dialog; GtkWidget *dialog;
GtkWidget *main_vbox; GtkWidget *main_vbox;
GtkWidget *preview; GtkWidget *preview;
GtkWidget *table; GtkWidget *table;
GtkObject *scale_data; GtkAdjustment *scale_data;
gboolean run; gboolean run;
gimp_ui_init (PLUG_IN_BINARY, FALSE); gimp_ui_init (PLUG_IN_BINARY, FALSE);

18
plug-ins/common/emboss.c
View File

@ -434,15 +434,15 @@ emboss (GimpDrawable *drawable,
static gboolean static gboolean
emboss_dialog (GimpDrawable *drawable) emboss_dialog (GimpDrawable *drawable)
{ {
GtkWidget *dialog; GtkWidget *dialog;
GtkWidget *main_vbox; GtkWidget *main_vbox;
GtkWidget *preview; GtkWidget *preview;
GtkWidget *radio1; GtkWidget *radio1;
GtkWidget *radio2; GtkWidget *radio2;
GtkWidget *frame; GtkWidget *frame;
GtkWidget *table; GtkWidget *table;
GtkObject *adj; GtkAdjustment *adj;
gboolean run; gboolean run;
gimp_ui_init (PLUG_IN_BINARY, TRUE); gimp_ui_init (PLUG_IN_BINARY, TRUE);

18
plug-ins/common/file-csource.c
View File

@ -873,15 +873,15 @@ rgb565_toggle_button_update (GtkWidget *toggle,
static gboolean static gboolean
run_save_dialog (Config *config) run_save_dialog (Config *config)
{ {
GtkWidget *dialog; GtkWidget *dialog;
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *table; GtkWidget *table;
GtkWidget *prefixed_name; GtkWidget *prefixed_name;
GtkWidget *centry; GtkWidget *centry;
GtkWidget *toggle; GtkWidget *toggle;
GtkWidget *alpha_toggle; GtkWidget *alpha_toggle;
GtkObject *adj; GtkAdjustment *adj;
gboolean run; gboolean run;
dialog = gimp_export_dialog_new (_("C-Source"), PLUG_IN_BINARY, SAVE_PROC); dialog = gimp_export_dialog_new (_("C-Source"), PLUG_IN_BINARY, SAVE_PROC);