Commit 89ae3524 authored by Emmanuele Bassi's avatar Emmanuele Bassi 👣 Committed by Matthias Clasen
Browse files

Rename the widget template API

The macros and functions are inconsistently named, and are not tied to
the "template" concept - to the point that it seems plausible to use
them without setting the template.

The new naming scheme is as follows:

  gtk_widget_class_bind_template_child_full
  gtk_widget_class_bind_template_callback_full

With the convenience macros:

  gtk_widget_class_bind_template_child
  gtk_widget_class_bind_template_child_internal
  gtk_widget_class_bind_template_callback

https://bugzilla.gnome.org/show_bug.cgi?id=700898
https://bugzilla.gnome.org/show_bug.cgi?id=700896
parent 62aa54f5
......@@ -253,22 +253,22 @@ gtk_message_row_class_init (GtkMessageRowClass *klass)
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
gtk_widget_class_set_template_from_resource (widget_class, "/listbox/listbox.ui");
gtk_widget_class_bind_child (widget_class, GtkMessageRow, content_label);
gtk_widget_class_bind_child (widget_class, GtkMessageRow, source_name);
gtk_widget_class_bind_child (widget_class, GtkMessageRow, source_nick);
gtk_widget_class_bind_child (widget_class, GtkMessageRow, short_time_label);
gtk_widget_class_bind_child (widget_class, GtkMessageRow, detailed_time_label);
gtk_widget_class_bind_child (widget_class, GtkMessageRow, extra_buttons_box);
gtk_widget_class_bind_child (widget_class, GtkMessageRow, details_revealer);
gtk_widget_class_bind_child (widget_class, GtkMessageRow, avatar_image);
gtk_widget_class_bind_child (widget_class, GtkMessageRow, resent_box);
gtk_widget_class_bind_child (widget_class, GtkMessageRow, resent_by_button);
gtk_widget_class_bind_child (widget_class, GtkMessageRow, n_reshares_label);
gtk_widget_class_bind_child (widget_class, GtkMessageRow, n_favorites_label);
gtk_widget_class_bind_child (widget_class, GtkMessageRow, expand_button);
gtk_widget_class_bind_callback (widget_class, expand_clicked);
gtk_widget_class_bind_callback (widget_class, reshare_clicked);
gtk_widget_class_bind_callback (widget_class, favorite_clicked);
gtk_widget_class_bind_template_child (widget_class, GtkMessageRow, content_label);
gtk_widget_class_bind_template_child (widget_class, GtkMessageRow, source_name);
gtk_widget_class_bind_template_child (widget_class, GtkMessageRow, source_nick);
gtk_widget_class_bind_template_child (widget_class, GtkMessageRow, short_time_label);
gtk_widget_class_bind_template_child (widget_class, GtkMessageRow, detailed_time_label);
gtk_widget_class_bind_template_child (widget_class, GtkMessageRow, extra_buttons_box);
gtk_widget_class_bind_template_child (widget_class, GtkMessageRow, details_revealer);
gtk_widget_class_bind_template_child (widget_class, GtkMessageRow, avatar_image);
gtk_widget_class_bind_template_child (widget_class, GtkMessageRow, resent_box);
gtk_widget_class_bind_template_child (widget_class, GtkMessageRow, resent_by_button);
gtk_widget_class_bind_template_child (widget_class, GtkMessageRow, n_reshares_label);
gtk_widget_class_bind_template_child (widget_class, GtkMessageRow, n_favorites_label);
gtk_widget_class_bind_template_child (widget_class, GtkMessageRow, expand_button);
gtk_widget_class_bind_template_callback (widget_class, expand_clicked);
gtk_widget_class_bind_template_callback (widget_class, reshare_clicked);
gtk_widget_class_bind_template_callback (widget_class, favorite_clicked);
widget_class->state_flags_changed = gtk_message_row_state_flags_changed;
}
......
......@@ -5513,10 +5513,10 @@ gtk_widget_compute_expand
gtk_widget_init_template
gtk_widget_class_set_template
gtk_widget_class_set_template_from_resource
gtk_widget_get_automated_child
gtk_widget_class_bind_child
gtk_widget_class_bind_child_internal
gtk_widget_class_automate_child
gtk_widget_get_template_child
gtk_widget_class_bind_template_child
gtk_widget_class_bind_template_child_internal
gtk_widget_class_bind_template_child_full
gtk_widget_class_bind_callback
gtk_widget_class_declare_callback
gtk_widget_class_set_connect_func
......
......@@ -32,7 +32,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
{
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
"/org/gtk/exampleapp/window.ui");
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
}
ExampleAppWindow *
......
......@@ -32,7 +32,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
{
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
"/org/gtk/exampleapp/window.ui");
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
}
ExampleAppWindow *
......
......@@ -57,7 +57,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
"/org/gtk/exampleapp/window.ui");
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
}
ExampleAppWindow *
......
......@@ -59,9 +59,9 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
"/org/gtk/exampleapp/prefs.ui");
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, close);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, close);
}
ExampleAppPrefs *
......
......@@ -54,7 +54,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
"/org/gtk/exampleapp/window.ui");
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
}
ExampleAppWindow *
......
......@@ -63,9 +63,9 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
"/org/gtk/exampleapp/prefs.ui");
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, close);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, close);
}
ExampleAppPrefs *
......
......@@ -116,10 +116,10 @@ example_app_window_class_init (ExampleAppWindowClass *class)
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
"/org/gtk/exampleapp/window.ui");
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, search);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchbar);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchentry);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, search);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchbar);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchentry);
}
ExampleAppWindow *
......
......@@ -63,9 +63,9 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
"/org/gtk/exampleapp/prefs.ui");
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, close);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, close);
}
ExampleAppPrefs *
......
......@@ -219,13 +219,13 @@ example_app_window_class_init (ExampleAppWindowClass *class)
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
"/org/gtk/exampleapp/window.ui");
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, search);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchbar);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchentry);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, gears);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, words);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, sidebar);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, search);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchbar);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchentry);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, gears);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, words);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, sidebar);
}
ExampleAppWindow *
......
......@@ -63,9 +63,9 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
"/org/gtk/exampleapp/prefs.ui");
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, close);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, close);
}
ExampleAppPrefs *
......
......@@ -265,15 +265,15 @@ example_app_window_class_init (ExampleAppWindowClass *class)
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
"/org/gtk/exampleapp/window.ui");
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, search);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchbar);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchentry);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, gears);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, words);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, sidebar);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, lines);
gtk_widget_class_bind_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, lines_label);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, search);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchbar);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchentry);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, gears);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, words);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, sidebar);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, lines);
gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, lines_label);
}
ExampleAppWindow *
......
......@@ -557,26 +557,26 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkaboutdialog.ui");
gtk_widget_class_bind_child (widget_class, GtkAboutDialog, notebook);
gtk_widget_class_bind_child (widget_class, GtkAboutDialog, logo_image);
gtk_widget_class_bind_child (widget_class, GtkAboutDialog, name_label);
gtk_widget_class_bind_child (widget_class, GtkAboutDialog, version_label);
gtk_widget_class_bind_child (widget_class, GtkAboutDialog, comments_label);
gtk_widget_class_bind_child (widget_class, GtkAboutDialog, copyright_label);
gtk_widget_class_bind_child (widget_class, GtkAboutDialog, license_label);
gtk_widget_class_bind_child (widget_class, GtkAboutDialog, website_label);
gtk_widget_class_bind_child (widget_class, GtkAboutDialog, credits_button);
gtk_widget_class_bind_child (widget_class, GtkAboutDialog, license_button);
gtk_widget_class_bind_child (widget_class, GtkAboutDialog, credits_grid);
gtk_widget_class_bind_child (widget_class, GtkAboutDialog, license_view);
gtk_widget_class_bind_callback (widget_class, credits_button_clicked);
gtk_widget_class_bind_callback (widget_class, license_button_clicked);
gtk_widget_class_bind_callback (widget_class, emit_activate_link);
gtk_widget_class_bind_callback (widget_class, text_view_event_after);
gtk_widget_class_bind_callback (widget_class, text_view_key_press_event);
gtk_widget_class_bind_callback (widget_class, text_view_visibility_notify_event);
gtk_widget_class_bind_callback (widget_class, text_view_motion_notify_event);
gtk_widget_class_bind_template_child (widget_class, GtkAboutDialog, notebook);
gtk_widget_class_bind_template_child (widget_class, GtkAboutDialog, logo_image);
gtk_widget_class_bind_template_child (widget_class, GtkAboutDialog, name_label);
gtk_widget_class_bind_template_child (widget_class, GtkAboutDialog, version_label);
gtk_widget_class_bind_template_child (widget_class, GtkAboutDialog, comments_label);
gtk_widget_class_bind_template_child (widget_class, GtkAboutDialog, copyright_label);
gtk_widget_class_bind_template_child (widget_class, GtkAboutDialog, license_label);
gtk_widget_class_bind_template_child (widget_class, GtkAboutDialog, website_label);
gtk_widget_class_bind_template_child (widget_class, GtkAboutDialog, credits_button);
gtk_widget_class_bind_template_child (widget_class, GtkAboutDialog, license_button);
gtk_widget_class_bind_template_child (widget_class, GtkAboutDialog, credits_grid);
gtk_widget_class_bind_template_child (widget_class, GtkAboutDialog, license_view);
gtk_widget_class_bind_template_callback (widget_class, credits_button_clicked);
gtk_widget_class_bind_template_callback (widget_class, license_button_clicked);
gtk_widget_class_bind_template_callback (widget_class, emit_activate_link);
gtk_widget_class_bind_template_callback (widget_class, text_view_event_after);
gtk_widget_class_bind_template_callback (widget_class, text_view_key_press_event);
gtk_widget_class_bind_template_callback (widget_class, text_view_visibility_notify_event);
gtk_widget_class_bind_template_callback (widget_class, text_view_motion_notify_event);
}
static gboolean
......
......@@ -660,11 +660,11 @@ gtk_app_chooser_dialog_class_init (GtkAppChooserDialogClass *klass)
widget_class = GTK_WIDGET_CLASS (klass);
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkappchooserdialog.ui");
gtk_widget_class_bind_child (widget_class, GtkAppChooserDialog, label);
gtk_widget_class_bind_child (widget_class, GtkAppChooserDialog, button);
gtk_widget_class_bind_child (widget_class, GtkAppChooserDialog, show_more_button);
gtk_widget_class_bind_child (widget_class, GtkAppChooserDialog, inner_box);
gtk_widget_class_bind_callback (widget_class, show_more_button_clicked_cb);
gtk_widget_class_bind_template_child (widget_class, GtkAppChooserDialog, label);
gtk_widget_class_bind_template_child (widget_class, GtkAppChooserDialog, button);
gtk_widget_class_bind_template_child (widget_class, GtkAppChooserDialog, show_more_button);
gtk_widget_class_bind_template_child (widget_class, GtkAppChooserDialog, inner_box);
gtk_widget_class_bind_template_callback (widget_class, show_more_button_clicked_cb);
}
static void
......
......@@ -1086,14 +1086,14 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass)
widget_class = GTK_WIDGET_CLASS (klass);
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkappchooserwidget.ui");
gtk_widget_class_bind_child (widget_class, GtkAppChooserWidget, program_list);
gtk_widget_class_bind_child (widget_class, GtkAppChooserWidget, program_list_store);
gtk_widget_class_bind_child (widget_class, GtkAppChooserWidget, column);
gtk_widget_class_bind_child (widget_class, GtkAppChooserWidget, padding_renderer);
gtk_widget_class_bind_child (widget_class, GtkAppChooserWidget, secondary_padding);
gtk_widget_class_bind_callback (widget_class, refresh_and_emit_app_selected);
gtk_widget_class_bind_callback (widget_class, program_list_selection_activated);
gtk_widget_class_bind_callback (widget_class, widget_button_press_event_cb);
gtk_widget_class_bind_template_child (widget_class, GtkAppChooserWidget, program_list);
gtk_widget_class_bind_template_child (widget_class, GtkAppChooserWidget, program_list_store);
gtk_widget_class_bind_template_child (widget_class, GtkAppChooserWidget, column);
gtk_widget_class_bind_template_child (widget_class, GtkAppChooserWidget, padding_renderer);
gtk_widget_class_bind_template_child (widget_class, GtkAppChooserWidget, secondary_padding);
gtk_widget_class_bind_template_callback (widget_class, refresh_and_emit_app_selected);
gtk_widget_class_bind_template_callback (widget_class, program_list_selection_activated);
gtk_widget_class_bind_template_callback (widget_class, widget_button_press_event_cb);
}
static void
......
......@@ -431,26 +431,26 @@ gtk_assistant_class_init (GtkAssistantClass *class)
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkassistant.ui");
gtk_widget_class_bind_child_internal (widget_class, GtkAssistant, action_area);
gtk_widget_class_bind_child (widget_class, GtkAssistant, content);
gtk_widget_class_bind_child (widget_class, GtkAssistant, cancel);
gtk_widget_class_bind_child (widget_class, GtkAssistant, forward);
gtk_widget_class_bind_child (widget_class, GtkAssistant, back);
gtk_widget_class_bind_child (widget_class, GtkAssistant, apply);
gtk_widget_class_bind_child (widget_class, GtkAssistant, close);
gtk_widget_class_bind_child (widget_class, GtkAssistant, last);
gtk_widget_class_bind_child (widget_class, GtkAssistant, sidebar);
gtk_widget_class_bind_child (widget_class, GtkAssistant, button_size_group);
gtk_widget_class_bind_child (widget_class, GtkAssistant, title_size_group);
gtk_widget_class_bind_callback (widget_class, assistant_sidebar_draw_cb);
gtk_widget_class_bind_callback (widget_class, assistant_remove_page_cb);
gtk_widget_class_bind_callback (widget_class, on_assistant_close);
gtk_widget_class_bind_callback (widget_class, on_assistant_apply);
gtk_widget_class_bind_callback (widget_class, on_assistant_forward);
gtk_widget_class_bind_callback (widget_class, on_assistant_back);
gtk_widget_class_bind_callback (widget_class, on_assistant_cancel);
gtk_widget_class_bind_callback (widget_class, on_assistant_last);
gtk_widget_class_bind_template_child_internal (widget_class, GtkAssistant, action_area);
gtk_widget_class_bind_template_child (widget_class, GtkAssistant, content);
gtk_widget_class_bind_template_child (widget_class, GtkAssistant, cancel);
gtk_widget_class_bind_template_child (widget_class, GtkAssistant, forward);
gtk_widget_class_bind_template_child (widget_class, GtkAssistant, back);
gtk_widget_class_bind_template_child (widget_class, GtkAssistant, apply);
gtk_widget_class_bind_template_child (widget_class, GtkAssistant, close);
gtk_widget_class_bind_template_child (widget_class, GtkAssistant, last);
gtk_widget_class_bind_template_child (widget_class, GtkAssistant, sidebar);
gtk_widget_class_bind_template_child (widget_class, GtkAssistant, button_size_group);
gtk_widget_class_bind_template_child (widget_class, GtkAssistant, title_size_group);
gtk_widget_class_bind_template_callback (widget_class, assistant_sidebar_draw_cb);
gtk_widget_class_bind_template_callback (widget_class, assistant_remove_page_cb);
gtk_widget_class_bind_template_callback (widget_class, on_assistant_close);
gtk_widget_class_bind_template_callback (widget_class, on_assistant_apply);
gtk_widget_class_bind_template_callback (widget_class, on_assistant_forward);
gtk_widget_class_bind_template_callback (widget_class, on_assistant_back);
gtk_widget_class_bind_template_callback (widget_class, on_assistant_cancel);
gtk_widget_class_bind_template_callback (widget_class, on_assistant_last);
}
static gint
......
......@@ -202,12 +202,12 @@ gtk_color_chooser_dialog_class_init (GtkColorChooserDialogClass *class)
*/
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkcolorchooserdialog.ui");
gtk_widget_class_bind_child (widget_class, GtkColorChooserDialog, chooser);
gtk_widget_class_bind_child (widget_class, GtkColorChooserDialog, cancel_button);
gtk_widget_class_bind_child (widget_class, GtkColorChooserDialog, select_button);
gtk_widget_class_bind_callback (widget_class, selected_cb);
gtk_widget_class_bind_callback (widget_class, propagate_notify);
gtk_widget_class_bind_callback (widget_class, color_activated_cb);
gtk_widget_class_bind_template_child (widget_class, GtkColorChooserDialog, chooser);
gtk_widget_class_bind_template_child (widget_class, GtkColorChooserDialog, cancel_button);
gtk_widget_class_bind_template_child (widget_class, GtkColorChooserDialog, select_button);
gtk_widget_class_bind_template_callback (widget_class, selected_cb);
gtk_widget_class_bind_template_callback (widget_class, propagate_notify);
gtk_widget_class_bind_template_callback (widget_class, color_activated_cb);
}
static void
......
......@@ -464,34 +464,34 @@ gtk_color_editor_class_init (GtkColorEditorClass *class)
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkcoloreditor.ui");
gtk_widget_class_bind_child (widget_class, GtkColorEditor, overlay);
gtk_widget_class_bind_child (widget_class, GtkColorEditor, grid);
gtk_widget_class_bind_child (widget_class, GtkColorEditor, swatch);
gtk_widget_class_bind_child (widget_class, GtkColorEditor, entry);
gtk_widget_class_bind_child (widget_class, GtkColorEditor, h_slider);
gtk_widget_class_bind_child (widget_class, GtkColorEditor, h_popup);
gtk_widget_class_bind_child (widget_class, GtkColorEditor, h_entry);
gtk_widget_class_bind_child (widget_class, GtkColorEditor, a_slider);
gtk_widget_class_bind_child (widget_class, GtkColorEditor, a_popup);
gtk_widget_class_bind_child (widget_class, GtkColorEditor, a_entry);
gtk_widget_class_bind_child (widget_class, GtkColorEditor, sv_plane);
gtk_widget_class_bind_child (widget_class, GtkColorEditor, sv_popup);
gtk_widget_class_bind_child (widget_class, GtkColorEditor, s_entry);
gtk_widget_class_bind_child (widget_class, GtkColorEditor, v_entry);
gtk_widget_class_bind_child (widget_class, GtkColorEditor, h_adj);
gtk_widget_class_bind_child (widget_class, GtkColorEditor, s_adj);
gtk_widget_class_bind_child (widget_class, GtkColorEditor, v_adj);
gtk_widget_class_bind_child (widget_class, GtkColorEditor, a_adj);
gtk_widget_class_bind_callback (widget_class, hsv_changed);
gtk_widget_class_bind_callback (widget_class, popup_draw);
gtk_widget_class_bind_callback (widget_class, popup_key_press);
gtk_widget_class_bind_callback (widget_class, dismiss_current_popup);
gtk_widget_class_bind_callback (widget_class, get_child_position);
gtk_widget_class_bind_callback (widget_class, entry_text_changed);
gtk_widget_class_bind_callback (widget_class, entry_apply);
gtk_widget_class_bind_callback (widget_class, entry_focus_out);
gtk_widget_class_bind_callback (widget_class, popup_edit);
gtk_widget_class_bind_template_child (widget_class, GtkColorEditor, overlay);
gtk_widget_class_bind_template_child (widget_class, GtkColorEditor, grid);
gtk_widget_class_bind_template_child (widget_class, GtkColorEditor, swatch);
gtk_widget_class_bind_template_child (widget_class, GtkColorEditor, entry);
gtk_widget_class_bind_template_child (widget_class, GtkColorEditor, h_slider);
gtk_widget_class_bind_template_child (widget_class, GtkColorEditor, h_popup);
gtk_widget_class_bind_template_child (widget_class, GtkColorEditor, h_entry);
gtk_widget_class_bind_template_child (widget_class, GtkColorEditor, a_slider);
gtk_widget_class_bind_template_child (widget_class, GtkColorEditor, a_popup);
gtk_widget_class_bind_template_child (widget_class, GtkColorEditor, a_entry);
gtk_widget_class_bind_template_child (widget_class, GtkColorEditor, sv_plane);
gtk_widget_class_bind_template_child (widget_class, GtkColorEditor, sv_popup);
gtk_widget_class_bind_template_child (widget_class, GtkColorEditor, s_entry);
gtk_widget_class_bind_template_child (widget_class, GtkColorEditor, v_entry);
gtk_widget_class_bind_template_child (widget_class, GtkColorEditor, h_adj);
gtk_widget_class_bind_template_child (widget_class, GtkColorEditor, s_adj);
gtk_widget_class_bind_template_child (widget_class, GtkColorEditor, v_adj);
gtk_widget_class_bind_template_child (widget_class, GtkColorEditor, a_adj);
gtk_widget_class_bind_template_callback (widget_class, hsv_changed);
gtk_widget_class_bind_template_callback (widget_class, popup_draw);
gtk_widget_class_bind_template_callback (widget_class, popup_key_press);
gtk_widget_class_bind_template_callback (widget_class, dismiss_current_popup);
gtk_widget_class_bind_template_callback (widget_class, get_child_position);
gtk_widget_class_bind_template_callback (widget_class, entry_text_changed);
gtk_widget_class_bind_template_callback (widget_class, entry_apply);
gtk_widget_class_bind_template_callback (widget_class, entry_focus_out);
gtk_widget_class_bind_template_callback (widget_class, popup_edit);
}
static void
......
......@@ -331,9 +331,9 @@ gtk_dialog_class_init (GtkDialogClass *class)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/gtkdialog.ui");
gtk_widget_class_bind_child_internal (widget_class, GtkDialog, vbox);
gtk_widget_class_bind_child_internal (widget_class, GtkDialog, action_area);
gtk_widget_class_bind_callback (widget_class, gtk_dialog_delete_event_handler);
gtk_widget_class_bind_template_child_internal (widget_class, GtkDialog, vbox);
gtk_widget_class_bind_template_child_internal (widget_class, GtkDialog, action_area);
gtk_widget_class_bind_template_callback (widget_class, gtk_dialog_delete_event_handler);
}
static void
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment