forked from AuroraMiddleware/gtk
gtk/gtktree.c gtk/gtktreemodel.c gtk/gtktreesortable.c gtk/gtktreeview.c
2008-08-08 Sven Neumann <sven@gimp.org> * gtk/gtktree.c * gtk/gtktreemodel.c * gtk/gtktreesortable.c * gtk/gtktreeview.c * gtk/gtkuimanager.c * gtk/gtkviewport.c: use canonical signal names. svn path=/trunk/; revision=21043
This commit is contained in:
parent
5de626f17d
commit
f47a4a2232
@ -1,3 +1,12 @@
|
||||
2008-08-08 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* gtk/gtktree.c
|
||||
* gtk/gtktreemodel.c
|
||||
* gtk/gtktreesortable.c
|
||||
* gtk/gtktreeview.c
|
||||
* gtk/gtkuimanager.c
|
||||
* gtk/gtkviewport.c: use canonical signal names.
|
||||
|
||||
2008-08-08 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* gtk/gtkwidget.c:
|
||||
|
@ -151,7 +151,7 @@ gtk_tree_class_init (GtkTreeClass *class)
|
||||
_gtk_marshal_VOID__VOID,
|
||||
GTK_TYPE_NONE, 0);
|
||||
tree_signals[SELECT_CHILD] =
|
||||
gtk_signal_new (I_("select_child"),
|
||||
gtk_signal_new (I_("select-child"),
|
||||
GTK_RUN_FIRST,
|
||||
GTK_CLASS_TYPE (object_class),
|
||||
GTK_SIGNAL_OFFSET (GtkTreeClass, select_child),
|
||||
@ -159,7 +159,7 @@ gtk_tree_class_init (GtkTreeClass *class)
|
||||
GTK_TYPE_NONE, 1,
|
||||
GTK_TYPE_WIDGET);
|
||||
tree_signals[UNSELECT_CHILD] =
|
||||
gtk_signal_new (I_("unselect_child"),
|
||||
gtk_signal_new (I_("unselect-child"),
|
||||
GTK_RUN_FIRST,
|
||||
GTK_CLASS_TYPE (object_class),
|
||||
GTK_SIGNAL_OFFSET (GtkTreeClass, unselect_child),
|
||||
|
@ -155,7 +155,7 @@ gtk_tree_model_base_init (gpointer g_class)
|
||||
* This signal is emitted when a row in the model has changed.
|
||||
*/
|
||||
tree_model_signals[ROW_CHANGED] =
|
||||
g_signal_new (I_("row_changed"),
|
||||
g_signal_new (I_("row-changed"),
|
||||
GTK_TYPE_TREE_MODEL,
|
||||
G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (GtkTreeModelIface, row_changed),
|
||||
@ -193,7 +193,7 @@ gtk_tree_model_base_init (gpointer g_class)
|
||||
closure = g_closure_new_simple (sizeof (GClosure), NULL);
|
||||
g_closure_set_marshal (closure, row_inserted_marshal);
|
||||
tree_model_signals[ROW_INSERTED] =
|
||||
g_signal_newv (I_("row_inserted"),
|
||||
g_signal_newv (I_("row-inserted"),
|
||||
GTK_TYPE_TREE_MODEL,
|
||||
G_SIGNAL_RUN_FIRST,
|
||||
closure,
|
||||
@ -212,7 +212,7 @@ gtk_tree_model_base_init (gpointer g_class)
|
||||
* its last child row.
|
||||
*/
|
||||
tree_model_signals[ROW_HAS_CHILD_TOGGLED] =
|
||||
g_signal_new (I_("row_has_child_toggled"),
|
||||
g_signal_new (I_("row-has-child-toggled"),
|
||||
GTK_TYPE_TREE_MODEL,
|
||||
G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (GtkTreeModelIface, row_has_child_toggled),
|
||||
@ -242,7 +242,7 @@ gtk_tree_model_base_init (gpointer g_class)
|
||||
closure = g_closure_new_simple (sizeof (GClosure), NULL);
|
||||
g_closure_set_marshal (closure, row_deleted_marshal);
|
||||
tree_model_signals[ROW_DELETED] =
|
||||
g_signal_newv (I_("row_deleted"),
|
||||
g_signal_newv (I_("row-deleted"),
|
||||
GTK_TYPE_TREE_MODEL,
|
||||
G_SIGNAL_RUN_FIRST,
|
||||
closure,
|
||||
@ -268,7 +268,7 @@ gtk_tree_model_base_init (gpointer g_class)
|
||||
closure = g_closure_new_simple (sizeof (GClosure), NULL);
|
||||
g_closure_set_marshal (closure, rows_reordered_marshal);
|
||||
tree_model_signals[ROWS_REORDERED] =
|
||||
g_signal_newv (I_("rows_reordered"),
|
||||
g_signal_newv (I_("rows-reordered"),
|
||||
GTK_TYPE_TREE_MODEL,
|
||||
G_SIGNAL_RUN_FIRST,
|
||||
closure,
|
||||
|
@ -63,7 +63,7 @@ gtk_tree_sortable_base_init (gpointer g_class)
|
||||
|
||||
if (! initialized)
|
||||
{
|
||||
g_signal_new (I_("sort_column_changed"),
|
||||
g_signal_new (I_("sort-column-changed"),
|
||||
GTK_TYPE_TREE_SORTABLE,
|
||||
G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (GtkTreeSortableIface, sort_column_changed),
|
||||
@ -85,7 +85,7 @@ gtk_tree_sortable_sort_column_changed (GtkTreeSortable *sortable)
|
||||
{
|
||||
g_return_if_fail (GTK_IS_TREE_SORTABLE (sortable));
|
||||
|
||||
g_signal_emit_by_name (sortable, "sort_column_changed");
|
||||
g_signal_emit_by_name (sortable, "sort-column-changed");
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -5381,7 +5381,8 @@ gtk_tree_view_key_press (GtkWidget *widget,
|
||||
gtk_widget_realize (tree_view->priv->search_window);
|
||||
|
||||
popup_menu_id = g_signal_connect (tree_view->priv->search_entry,
|
||||
"popup_menu", G_CALLBACK (gtk_true), NULL);
|
||||
"popup-menu", G_CALLBACK (gtk_true),
|
||||
NULL);
|
||||
|
||||
/* Move the entry off screen */
|
||||
screen = gtk_widget_get_screen (GTK_WIDGET (tree_view));
|
||||
@ -10315,16 +10316,16 @@ gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view)
|
||||
gtk_window_set_type_hint (GTK_WINDOW (tree_view->priv->search_window),
|
||||
GDK_WINDOW_TYPE_HINT_UTILITY);
|
||||
gtk_window_set_modal (GTK_WINDOW (tree_view->priv->search_window), TRUE);
|
||||
g_signal_connect (tree_view->priv->search_window, "delete_event",
|
||||
g_signal_connect (tree_view->priv->search_window, "delete-event",
|
||||
G_CALLBACK (gtk_tree_view_search_delete_event),
|
||||
tree_view);
|
||||
g_signal_connect (tree_view->priv->search_window, "key_press_event",
|
||||
g_signal_connect (tree_view->priv->search_window, "key-press-event",
|
||||
G_CALLBACK (gtk_tree_view_search_key_press_event),
|
||||
tree_view);
|
||||
g_signal_connect (tree_view->priv->search_window, "button_press_event",
|
||||
g_signal_connect (tree_view->priv->search_window, "button-press-event",
|
||||
G_CALLBACK (gtk_tree_view_search_button_press_event),
|
||||
tree_view);
|
||||
g_signal_connect (tree_view->priv->search_window, "scroll_event",
|
||||
g_signal_connect (tree_view->priv->search_window, "scroll-event",
|
||||
G_CALLBACK (gtk_tree_view_search_scroll_event),
|
||||
tree_view);
|
||||
|
||||
@ -10341,14 +10342,14 @@ gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view)
|
||||
/* add entry */
|
||||
tree_view->priv->search_entry = gtk_entry_new ();
|
||||
gtk_widget_show (tree_view->priv->search_entry);
|
||||
g_signal_connect (tree_view->priv->search_entry, "populate_popup",
|
||||
g_signal_connect (tree_view->priv->search_entry, "populate-popup",
|
||||
G_CALLBACK (gtk_tree_view_search_disable_popdown),
|
||||
tree_view);
|
||||
g_signal_connect (tree_view->priv->search_entry,
|
||||
"activate", G_CALLBACK (gtk_tree_view_search_activate),
|
||||
tree_view);
|
||||
g_signal_connect (GTK_ENTRY (tree_view->priv->search_entry)->im_context,
|
||||
"preedit_changed",
|
||||
"preedit-changed",
|
||||
G_CALLBACK (gtk_tree_view_search_preedit_changed),
|
||||
tree_view);
|
||||
gtk_container_add (GTK_CONTAINER (vbox),
|
||||
@ -10767,23 +10768,23 @@ gtk_tree_view_set_model (GtkTreeView *tree_view,
|
||||
|
||||
g_object_ref (tree_view->priv->model);
|
||||
g_signal_connect (tree_view->priv->model,
|
||||
"row_changed",
|
||||
"row-changed",
|
||||
G_CALLBACK (gtk_tree_view_row_changed),
|
||||
tree_view);
|
||||
g_signal_connect (tree_view->priv->model,
|
||||
"row_inserted",
|
||||
"row-inserted",
|
||||
G_CALLBACK (gtk_tree_view_row_inserted),
|
||||
tree_view);
|
||||
g_signal_connect (tree_view->priv->model,
|
||||
"row_has_child_toggled",
|
||||
"row-has-child-toggled",
|
||||
G_CALLBACK (gtk_tree_view_row_has_child_toggled),
|
||||
tree_view);
|
||||
g_signal_connect (tree_view->priv->model,
|
||||
"row_deleted",
|
||||
"row-deleted",
|
||||
G_CALLBACK (gtk_tree_view_row_deleted),
|
||||
tree_view);
|
||||
g_signal_connect (tree_view->priv->model,
|
||||
"rows_reordered",
|
||||
"rows-reordered",
|
||||
G_CALLBACK (gtk_tree_view_rows_reordered),
|
||||
tree_view);
|
||||
|
||||
@ -14074,7 +14075,7 @@ gtk_tree_view_set_search_entry (GtkTreeView *tree_view,
|
||||
tree_view);
|
||||
}
|
||||
|
||||
g_signal_connect (tree_view->priv->search_entry, "key_press_event",
|
||||
g_signal_connect (tree_view->priv->search_entry, "key-press-event",
|
||||
G_CALLBACK (gtk_tree_view_search_key_press_event),
|
||||
tree_view);
|
||||
|
||||
@ -14825,7 +14826,7 @@ gtk_tree_view_real_start_editing (GtkTreeView *tree_view,
|
||||
(GdkEvent *)event);
|
||||
|
||||
gtk_widget_grab_focus (GTK_WIDGET (cell_editable));
|
||||
g_signal_connect (cell_editable, "remove_widget",
|
||||
g_signal_connect (cell_editable, "remove-widget",
|
||||
G_CALLBACK (gtk_tree_view_remove_widget), tree_view);
|
||||
}
|
||||
|
||||
|
@ -243,7 +243,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
|
||||
* Since: 2.4
|
||||
*/
|
||||
ui_manager_signals[ADD_WIDGET] =
|
||||
g_signal_new (I_("add_widget"),
|
||||
g_signal_new (I_("add-widget"),
|
||||
G_OBJECT_CLASS_TYPE (klass),
|
||||
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
|
||||
G_STRUCT_OFFSET (GtkUIManagerClass, add_widget),
|
||||
@ -262,7 +262,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
|
||||
* Since: 2.4
|
||||
*/
|
||||
ui_manager_signals[ACTIONS_CHANGED] =
|
||||
g_signal_new (I_("actions_changed"),
|
||||
g_signal_new (I_("actions-changed"),
|
||||
G_OBJECT_CLASS_TYPE (klass),
|
||||
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
|
||||
G_STRUCT_OFFSET (GtkUIManagerClass, actions_changed),
|
||||
@ -286,7 +286,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
|
||||
* Since: 2.4
|
||||
*/
|
||||
ui_manager_signals[CONNECT_PROXY] =
|
||||
g_signal_new (I_("connect_proxy"),
|
||||
g_signal_new (I_("connect-proxy"),
|
||||
G_OBJECT_CLASS_TYPE (klass),
|
||||
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
|
||||
G_STRUCT_OFFSET (GtkUIManagerClass, connect_proxy),
|
||||
@ -308,7 +308,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
|
||||
* Since: 2.4
|
||||
*/
|
||||
ui_manager_signals[DISCONNECT_PROXY] =
|
||||
g_signal_new (I_("disconnect_proxy"),
|
||||
g_signal_new (I_("disconnect-proxy"),
|
||||
G_OBJECT_CLASS_TYPE (klass),
|
||||
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
|
||||
G_STRUCT_OFFSET (GtkUIManagerClass, disconnect_proxy),
|
||||
@ -332,7 +332,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
|
||||
* Since: 2.4
|
||||
*/
|
||||
ui_manager_signals[PRE_ACTIVATE] =
|
||||
g_signal_new (I_("pre_activate"),
|
||||
g_signal_new (I_("pre-activate"),
|
||||
G_OBJECT_CLASS_TYPE (klass),
|
||||
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
|
||||
G_STRUCT_OFFSET (GtkUIManagerClass, pre_activate),
|
||||
@ -355,7 +355,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
|
||||
* Since: 2.4
|
||||
*/
|
||||
ui_manager_signals[POST_ACTIVATE] =
|
||||
g_signal_new (I_("post_activate"),
|
||||
g_signal_new (I_("post-activate"),
|
||||
G_OBJECT_CLASS_TYPE (klass),
|
||||
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
|
||||
G_STRUCT_OFFSET (GtkUIManagerClass, post_activate),
|
||||
@ -2796,7 +2796,7 @@ queue_update (GtkUIManager *self)
|
||||
* the main window before showing it:
|
||||
* |[
|
||||
* gtk_container_add (GTK_CONTAINER (window), vbox);
|
||||
* g_signal_connect (merge, "add_widget",
|
||||
* g_signal_connect (merge, "add-widget",
|
||||
* G_CALLBACK (add_widget), vbox);
|
||||
* gtk_ui_manager_add_ui_from_file (merge, "my-menus");
|
||||
* gtk_ui_manager_add_ui_from_file (merge, "my-toolbars");
|
||||
|
@ -126,7 +126,7 @@ gtk_viewport_class_init (GtkViewportClass *class)
|
||||
GTK_PARAM_READWRITE));
|
||||
|
||||
widget_class->set_scroll_adjustments_signal =
|
||||
g_signal_new (I_("set_scroll_adjustments"),
|
||||
g_signal_new (I_("set-scroll-adjustments"),
|
||||
G_OBJECT_CLASS_TYPE (gobject_class),
|
||||
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
|
||||
G_STRUCT_OFFSET (GtkViewportClass, set_scroll_adjustments),
|
||||
|
Loading…
Reference in New Issue
Block a user