callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Another round of template binding api changes

Browse Source 
We rename the gtk_widget_class_bind_template_child{_internal}
macros by appending a _private to their name. Otherwise, it
would be too magic to pass the 'public' names as arguments,
but affect a member of the Private struct. At the same time,

Add two new macros with the old names,
gtk_widget_class_bind_template_child{_internal} that operate
on members of the instance struct.
This commit is contained in:
Matthias Clasen
2013-07-26 16:29:12 -04:00
parent 3358c544da
commit cda60c3c40
38 changed files with 327 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
gtk/gtkprintunixdialog.c
View File

@ -480,69 +480,69 @@ gtk_print_unix_dialog_class_init (GtkPrintUnixDialogClass *class)
"/org/gtk/libgtk/gtkprintunixdialog.ui");
/* GtkTreeView / GtkTreeModel */
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_treeview);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_list);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_list_filter);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, page_setup_list);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, custom_paper_list);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_icon_column);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_name_column);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_location_column);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_status_column);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_icon_renderer);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_name_renderer);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_location_renderer);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_status_renderer);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, printer_treeview);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, printer_list);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, printer_list_filter);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, page_setup_list);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, custom_paper_list);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, printer_icon_column);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, printer_name_column);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, printer_location_column);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, printer_status_column);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, printer_icon_renderer);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, printer_name_renderer);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, printer_location_renderer);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, printer_status_renderer);
/* General Widgetry */
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, notebook);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, all_pages_radio);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, all_pages_radio);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, current_page_radio);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, selection_radio);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, range_table);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, page_range_radio);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, page_range_entry);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, copies_spin);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, collate_check);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, reverse_check);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, collate_image);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, page_layout_preview);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, scale_spin);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, page_set_combo);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, print_now_radio);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, print_at_radio);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, print_at_entry);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, print_hold_radio);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, preview_button);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, paper_size_combo);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, paper_size_combo_label);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, paper_size_renderer);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, orientation_combo);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, orientation_combo_label);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, conflicts_widget);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, job_page);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, finishing_table);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, finishing_page);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, image_quality_table);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, image_quality_page);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, color_table);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, color_page);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, advanced_vbox);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, advanced_page);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, extension_point);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, notebook);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, all_pages_radio);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, all_pages_radio);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, current_page_radio);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, selection_radio);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, range_table);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, page_range_radio);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, page_range_entry);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, copies_spin);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, collate_check);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, reverse_check);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, collate_image);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, page_layout_preview);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, scale_spin);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, page_set_combo);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, print_now_radio);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, print_at_radio);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, print_at_entry);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, print_hold_radio);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, preview_button);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, paper_size_combo);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, paper_size_combo_label);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, paper_size_renderer);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, orientation_combo);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, orientation_combo_label);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, conflicts_widget);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, job_page);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, finishing_table);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, finishing_page);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, image_quality_table);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, image_quality_page);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, color_table);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, color_page);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, advanced_vbox);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, advanced_page);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, extension_point);
/* GtkPrinterOptionWidgets... */
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, pages_per_sheet);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, duplex);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, paper_type);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, paper_source);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, output_tray);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, job_prio);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, billing_info);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, cover_before);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, cover_after);
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, number_up_layout);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, pages_per_sheet);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, duplex);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, paper_type);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, paper_source);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, output_tray);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, job_prio);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, billing_info);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, cover_before);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, cover_after);
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, number_up_layout);
/* Callbacks handled in the UI */
gtk_widget_class_bind_template_callback (widget_class, gtk_print_unix_dialog_destroy);