From 42c71a3261581caafa1be74105e9f910559d3a52 Mon Sep 17 00:00:00 2001 From: Jaap Keuter Date: Thu, 28 Mar 2013 06:36:44 +0000 Subject: Follow up on bug 8416. Remove C++ incompatibilities in GTK+ 3 code. svn path=/trunk/; revision=48606 --- ui/gtk/print_dlg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ui/gtk/print_dlg.c') diff --git a/ui/gtk/print_dlg.c b/ui/gtk/print_dlg.c index 66274d0847..e1b87a0a0f 100644 --- a/ui/gtk/print_dlg.c +++ b/ui/gtk/print_dlg.c @@ -618,7 +618,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) if (args->to_file) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dest_cb), TRUE); gtk_widget_set_tooltip_text(dest_cb, "Output to file instead of printer"); - ws_gtk_grid_attach_extended(GTK_GRID(printer_grid), dest_cb, 0, 0, 1, 1, 0, 0, 0, 0); + ws_gtk_grid_attach(GTK_GRID(printer_grid), dest_cb, 0, 0, 1, 1); if(action == output_action_print) gtk_widget_show(dest_cb); @@ -627,7 +627,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) g_object_set_data(G_OBJECT(dest_cb), PRINT_FILE_TE_KEY, file_te); gtk_widget_set_tooltip_text(file_te, "Enter Output filename"); gtk_entry_set_text(GTK_ENTRY(file_te), args->file); - ws_gtk_grid_attach_extended(GTK_GRID(printer_grid), file_te, 1, 0, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); + ws_gtk_grid_attach_extended(GTK_GRID(printer_grid), file_te, 1, 0, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); gtk_widget_set_sensitive(file_te, args->to_file); gtk_widget_show(file_te); if (args->to_file) @@ -638,7 +638,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) g_object_set_data(G_OBJECT(dest_cb), PRINT_FILE_BT_KEY, file_bt); g_object_set_data(G_OBJECT(file_bt), PRINT_TE_PTR_KEY, file_te); gtk_widget_set_tooltip_text(file_bt, "Browse output filename in filesystem"); - ws_gtk_grid_attach_extended(GTK_GRID(printer_grid), file_bt, 2, 0, 1, 1, 0, 0, 0, 0); + ws_gtk_grid_attach(GTK_GRID(printer_grid), file_bt, 2, 0, 1, 1); gtk_widget_set_sensitive(file_bt, args->to_file); gtk_widget_show(file_bt); @@ -647,7 +647,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) cmd_lb = gtk_label_new("Print command:"); g_object_set_data(G_OBJECT(dest_cb), PRINT_CMD_LB_KEY, cmd_lb); gtk_misc_set_alignment(GTK_MISC(cmd_lb), 1.0f, 0.5f); - ws_gtk_grid_attach_extended(GTK_GRID(printer_grid), cmd_lb, 0, 1, 1, 1, 0, 0, 0, 0); + ws_gtk_grid_attach(GTK_GRID(printer_grid), cmd_lb, 0, 1, 1, 1); gtk_widget_set_sensitive(cmd_lb, !args->to_file); if(action == output_action_print) gtk_widget_show(cmd_lb); @@ -656,7 +656,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) g_object_set_data(G_OBJECT(dest_cb), PRINT_CMD_TE_KEY, cmd_te); gtk_widget_set_tooltip_text(cmd_te, "Enter print command"); gtk_entry_set_text(GTK_ENTRY(cmd_te), args->cmd); - ws_gtk_grid_attach_extended(GTK_GRID(printer_grid), cmd_te, 1, 1, 1, 1, 0, 0, 0, 0); + ws_gtk_grid_attach(GTK_GRID(printer_grid), cmd_te, 1, 1, 1, 1); gtk_widget_set_sensitive(cmd_te, !args->to_file); if(action == output_action_print) gtk_widget_show(cmd_te); -- cgit v1.2.1