AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtk/gtktext.c gtk/gtktextbuffer.c gtk/gtktextlayout.c

Browse Source 
2008-08-08  Sven Neumann  <sven@gimp.org>

	* gtk/gtktext.c
	* gtk/gtktextbuffer.c
	* gtk/gtktextlayout.c
	* gtk/gtktexttagtable.c
	* gtk/gtktextview.c
	* gtk/gtktipsquery.c
	* gtk/gtktoolbar.c
	* gtk/gtktoolitem.c
	* gtk/gtktreeitem.c
	* gtk/gtktreemodelfilter.c
	* gtk/gtktreemodelsort.c
	* gtk/gtktreeviewcolumn.c: use canonical signal names.


svn path=/trunk/; revision=21045
This commit is contained in:
Sven Neumann 2008-08-08 14:23:32 +00:00 committed by Sven Neumann
parent e601636ffb
commit e3c01cf601
14 changed files with 113 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2008-08-08 Sven Neumann <sven@gimp.org>
* gtk/gtktext.c
* gtk/gtktextbuffer.c
* gtk/gtktextlayout.c
* gtk/gtktexttagtable.c
* gtk/gtktextview.c
* gtk/gtktipsquery.c
* gtk/gtktoolbar.c
* gtk/gtktoolitem.c
* gtk/gtktreeitem.c
* gtk/gtktreemodelfilter.c
* gtk/gtktreemodelsort.c
* gtk/gtktreeviewcolumn.c: use canonical signal names.
2008-08-08 Sven Neumann <sven@gimp.org>
* gtk/gtktree.c

2
gtk/gtktext.c
View File

@ -572,7 +572,7 @@ gtk_text_class_init (GtkTextClass *class)
GTK_PARAM_READWRITE));
widget_class->set_scroll_adjustments_signal =
gtk_signal_new (I_("set_scroll_adjustments"),
gtk_signal_new (I_("set-scroll-adjustments"),
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkTextClass, set_scroll_adjustments),

22
gtk/gtktextbuffer.c
View File

@ -283,7 +283,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* gtk_text_buffer_insert_range().
*/
signals[INSERT_TEXT] =
g_signal_new (I_("insert_text"),
g_signal_new (I_("insert-text"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, insert_text),
@ -312,7 +312,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* See also: gtk_text_buffer_insert_pixbuf().
*/
signals[INSERT_PIXBUF] =
g_signal_new (I_("insert_pixbuf"),
g_signal_new (I_("insert-pixbuf"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, insert_pixbuf),
@ -342,7 +342,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* See also: gtk_text_buffer_insert_child_anchor().
*/
signals[INSERT_CHILD_ANCHOR] =
g_signal_new (I_("insert_child_anchor"),
g_signal_new (I_("insert-child-anchor"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, insert_child_anchor),
@ -372,7 +372,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* See also: gtk_text_buffer_delete().
*/
signals[DELETE_RANGE] =
g_signal_new (I_("delete_range"),
g_signal_new (I_("delete-range"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, delete_range),
@ -411,7 +411,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* gtk_text_buffer_set_modified().
*/
signals[MODIFIED_CHANGED] =
g_signal_new (I_("modified_changed"),
g_signal_new (I_("modified-changed"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, modified_changed),
@ -434,7 +434,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* gtk_text_buffer_move_mark().
*/
signals[MARK_SET] =
g_signal_new (I_("mark_set"),
g_signal_new (I_("mark-set"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, mark_set),
@ -457,7 +457,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* gtk_text_buffer_delete_mark().
*/
signals[MARK_DELETED] =
g_signal_new (I_("mark_deleted"),
g_signal_new (I_("mark-deleted"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, mark_deleted),
@ -487,7 +487,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* gtk_text_buffer_insert_range().
*/
signals[APPLY_TAG] =
g_signal_new (I_("apply_tag"),
g_signal_new (I_("apply-tag"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, apply_tag),
@ -518,7 +518,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* gtk_text_buffer_remove_tag().
*/
signals[REMOVE_TAG] =
g_signal_new (I_("remove_tag"),
g_signal_new (I_("remove-tag"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, remove_tag),
@ -546,7 +546,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* gtk_text_buffer_delete_selection().
*/
signals[BEGIN_USER_ACTION] =
g_signal_new (I_("begin_user_action"),
g_signal_new (I_("begin-user-action"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, begin_user_action),
@ -572,7 +572,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* gtk_text_buffer_backspace().
*/
signals[END_USER_ACTION] =
g_signal_new (I_("end_user_action"),
g_signal_new (I_("end-user-action"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, end_user_action),

8
gtk/gtktextlayout.c
View File

@ -205,7 +205,7 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass)
G_TYPE_INT);
signals[ALLOCATE_CHILD] =
g_signal_new (I_("allocate_child"),
g_signal_new (I_("allocate-child"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextLayoutClass, allocate_child),
@ -329,11 +329,11 @@ gtk_text_layout_set_buffer (GtkTextLayout *layout,
_gtk_text_btree_add_view (_gtk_text_buffer_get_btree (buffer), layout);
/* Bind to all signals that move the insert mark. */
g_signal_connect_after (layout->buffer, "mark_set",
g_signal_connect_after (layout->buffer, "mark-set",
G_CALLBACK (gtk_text_layout_mark_set_handler), layout);
g_signal_connect_after (layout->buffer, "insert_text",
g_signal_connect_after (layout->buffer, "insert-text",
G_CALLBACK (gtk_text_layout_buffer_insert_text), layout);
g_signal_connect_after (layout->buffer, "delete_range",
g_signal_connect_after (layout->buffer, "delete-range",
G_CALLBACK (gtk_text_layout_buffer_delete_range), layout);
gtk_text_layout_update_cursor_line (layout);

6
gtk/gtktexttagtable.c
View File

@ -69,7 +69,7 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass)
object_class->finalize = gtk_text_tag_table_finalize;
signals[TAG_CHANGED] =
g_signal_new (I_("tag_changed"),
g_signal_new (I_("tag-changed"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextTagTableClass, tag_changed),
@ -81,7 +81,7 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass)
G_TYPE_BOOLEAN);
signals[TAG_ADDED] =
g_signal_new (I_("tag_added"),
g_signal_new (I_("tag-added"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextTagTableClass, tag_added),
@ -92,7 +92,7 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass)
GTK_TYPE_TEXT_TAG);
signals[TAG_REMOVED] =
g_signal_new (I_("tag_removed"),
g_signal_new (I_("tag-removed"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextTagTableClass, tag_removed),

92
gtk/gtktextview.c
View File

@ -443,14 +443,14 @@ add_move_binding (GtkBindingSet *binding_set,
g_assert ((modmask & GDK_SHIFT_MASK) == 0);
gtk_binding_entry_add_signal (binding_set, keyval, modmask,
"move_cursor", 3,
"move-cursor", 3,
G_TYPE_ENUM, step,
G_TYPE_INT, count,
G_TYPE_BOOLEAN, FALSE);
/* Selection-extending version */
gtk_binding_entry_add_signal (binding_set, keyval, modmask | GDK_SHIFT_MASK,
"move_cursor", 3,
"move-cursor", 3,
G_TYPE_ENUM, step,
G_TYPE_INT, count,
G_TYPE_BOOLEAN, TRUE);
@ -702,7 +702,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
* </itemizedlist>
*/
signals[MOVE_CURSOR] =
g_signal_new (I_("move_cursor"),
g_signal_new (I_("move-cursor"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkTextViewClass, move_cursor),
@ -729,7 +729,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
* granularity.
*/
signals[PAGE_HORIZONTALLY] =
g_signal_new (I_("page_horizontally"),
g_signal_new (I_("page-horizontally"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkTextViewClass, page_horizontally),
@ -754,7 +754,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
* There are no default bindings for this signal.
*/
signals[MOVE_VIEWPORT] =
g_signal_new_class_handler (I_("move_viewport"),
g_signal_new_class_handler (I_("move-viewport"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_text_view_move_viewport),
@ -765,7 +765,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
G_TYPE_INT);
signals[SET_ANCHOR] =
g_signal_new (I_("set_anchor"),
g_signal_new (I_("set-anchor"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkTextViewClass, set_anchor),
@ -774,7 +774,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
G_TYPE_NONE, 0);
signals[INSERT_AT_CURSOR] =
g_signal_new (I_("insert_at_cursor"),
g_signal_new (I_("insert-at-cursor"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkTextViewClass, insert_at_cursor),
@ -803,7 +803,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
* backwords.
*/
signals[DELETE_FROM_CURSOR] =
g_signal_new (I_("delete_from_cursor"),
g_signal_new (I_("delete-from-cursor"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkTextViewClass, delete_from_cursor),
@ -845,7 +845,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
* Ctrl-x and Shift-Delete.
*/
signals[CUT_CLIPBOARD] =
g_signal_new (I_("cut_clipboard"),
g_signal_new (I_("cut-clipboard"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkTextViewClass, cut_clipboard),
@ -865,7 +865,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
* Ctrl-c and Ctrl-Insert.
*/
signals[COPY_CLIPBOARD] =
g_signal_new (I_("copy_clipboard"),
g_signal_new (I_("copy-clipboard"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkTextViewClass, copy_clipboard),
@ -886,7 +886,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
* Ctrl-v and Shift-Insert.
*/
signals[PASTE_CLIPBOARD] =
g_signal_new (I_("paste_clipboard"),
g_signal_new (I_("paste-clipboard"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkTextViewClass, paste_clipboard),
@ -905,7 +905,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
* The default bindings for this signal is Insert.
*/
signals[TOGGLE_OVERWRITE] =
g_signal_new (I_("toggle_overwrite"),
g_signal_new (I_("toggle-overwrite"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkTextViewClass, toggle_overwrite),
@ -914,7 +914,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
G_TYPE_NONE, 0);
signals[SET_SCROLL_ADJUSTMENTS] =
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 (GtkTextViewClass, set_scroll_adjustments),
@ -926,7 +926,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
widget_class->set_scroll_adjustments_signal = signals[SET_SCROLL_ADJUSTMENTS];
signals[POPULATE_POPUP] =
g_signal_new (I_("populate_popup"),
g_signal_new (I_("populate-popup"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextViewClass, populate_popup),
@ -949,7 +949,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
* for selecting and Shift-Ctrl-a and Ctrl-\ for unselecting.
*/
signals[SELECT_ALL] =
g_signal_new_class_handler (I_("select_all"),
g_signal_new_class_handler (I_("select-all"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_text_view_select_all),
@ -968,7 +968,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
* The default binding for this signal is F7.
*/
signals[TOGGLE_CURSOR_VISIBLE] =
g_signal_new_class_handler (I_("toggle_cursor_visible"),
g_signal_new_class_handler (I_("toggle-cursor-visible"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_text_view_toggle_cursor_visible),
@ -1081,30 +1081,30 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
/* Select all */
gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
"select_all", 1,
"select-all", 1,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
"select_all", 1,
"select-all", 1,
G_TYPE_BOOLEAN, TRUE);
/* Unselect all */
gtk_binding_entry_add_signal (binding_set, GDK_backslash, GDK_CONTROL_MASK,
"select_all", 1,
"select-all", 1,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"select_all", 1,
"select-all", 1,
G_TYPE_BOOLEAN, FALSE);
/* Deleting text */
gtk_binding_entry_add_signal (binding_set, GDK_Delete, 0,
"delete_from_cursor", 2,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_CHARS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, 0,
"delete_from_cursor", 2,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_CHARS,
G_TYPE_INT, 1);
@ -1116,59 +1116,59 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
"backspace", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_CONTROL_MASK,
"delete_from_cursor", 2,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, GDK_CONTROL_MASK,
"delete_from_cursor", 2,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_CONTROL_MASK,
"delete_from_cursor", 2,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
G_TYPE_INT, -1);
/* Cut/copy/paste */
gtk_binding_entry_add_signal (binding_set, GDK_x, GDK_CONTROL_MASK,
"cut_clipboard", 0);
"cut-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_c, GDK_CONTROL_MASK,
"copy_clipboard", 0);
"copy-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_v, GDK_CONTROL_MASK,
"paste_clipboard", 0);
"paste-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_SHIFT_MASK,
"cut_clipboard", 0);
"cut-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Insert, GDK_CONTROL_MASK,
"copy_clipboard", 0);
"copy-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Insert, GDK_SHIFT_MASK,
"paste_clipboard", 0);
"paste-clipboard", 0);
/* Overwrite */
gtk_binding_entry_add_signal (binding_set, GDK_Insert, 0,
"toggle_overwrite", 0);
"toggle-overwrite", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Insert, 0,
"toggle_overwrite", 0);
"toggle-overwrite", 0);
/* Caret mode */
gtk_binding_entry_add_signal (binding_set, GDK_F7, 0,
"toggle_cursor_visible", 0);
"toggle-cursor-visible", 0);
/* Control-tab focus motion */
gtk_binding_entry_add_signal (binding_set, GDK_Tab, GDK_CONTROL_MASK,
"move_focus", 1,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, GDK_CONTROL_MASK,
"move_focus", 1,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
gtk_binding_entry_add_signal (binding_set, GDK_Tab, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"move_focus", 1,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"move_focus", 1,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
g_type_class_add_private (gobject_class, sizeof (GtkTextViewPrivate));
@ -1211,11 +1211,11 @@ gtk_text_view_init (GtkTextView *text_view)
g_signal_connect (text_view->im_context, "commit",
G_CALLBACK (gtk_text_view_commit_handler), text_view);
g_signal_connect (text_view->im_context, "preedit_changed",
g_signal_connect (text_view->im_context, "preedit-changed",
G_CALLBACK (gtk_text_view_preedit_changed_handler), text_view);
g_signal_connect (text_view->im_context, "retrieve_surrounding",
g_signal_connect (text_view->im_context, "retrieve-surrounding",
G_CALLBACK (gtk_text_view_retrieve_surrounding_handler), text_view);
g_signal_connect (text_view->im_context, "delete_surrounding",
g_signal_connect (text_view->im_context, "delete-surrounding",
G_CALLBACK (gtk_text_view_delete_surrounding_handler), text_view);
text_view->cursor_visible = TRUE;
@ -1360,7 +1360,7 @@ gtk_text_view_set_buffer (GtkTextView *text_view,
text_view->first_para_pixels = 0;
g_signal_connect (text_view->buffer, "mark_set",
g_signal_connect (text_view->buffer, "mark-set",
G_CALLBACK (gtk_text_view_mark_set_handler),
text_view);
g_signal_connect (text_view->buffer, "notify::paste-target-list",
@ -4338,7 +4338,7 @@ gtk_text_view_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
}
g_signal_connect (gdk_keymap_get_for_display (gtk_widget_get_display (widget)),
"direction_changed",
"direction-changed",
G_CALLBACK (keymap_direction_changed), text_view);
gtk_text_view_check_keymap_direction (text_view);
@ -6132,7 +6132,7 @@ gtk_text_view_start_selection_drag (GtkTextView *text_view,
gtk_text_view_check_cursor_blink (text_view);
text_view->selection_drag_handler = g_signal_connect_data (text_view,
"motion_notify_event",
"motion-notify-event",
G_CALLBACK (selection_motion_event_handler),
data,
(GClosureNotify) selection_data_free, 0);
@ -6235,7 +6235,7 @@ gtk_text_view_ensure_layout (GtkTextView *text_view)
text_view);
g_signal_connect (text_view->layout,
"allocate_child",
"allocate-child",
G_CALLBACK (gtk_text_view_child_allocated),
text_view);
@ -6427,7 +6427,7 @@ gtk_text_view_start_selection_dnd (GtkTextView *text_view,
target_list = gtk_text_buffer_get_copy_target_list (get_buffer (text_view));
g_signal_connect (text_view, "drag_begin",
g_signal_connect (text_view, "drag-begin",
G_CALLBACK (drag_begin_cb), NULL);
gtk_drag_begin (GTK_WIDGET (text_view), target_list,
GDK_ACTION_COPY | GDK_ACTION_MOVE,

8
gtk/gtktipsquery.c
View File

@ -142,21 +142,21 @@ gtk_tips_query_class_init (GtkTipsQueryClass *class)
gtk_object_add_arg_type ("GtkTipsQuery::label-no-tip", GTK_TYPE_STRING, GTK_ARG_READWRITE | G_PARAM_STATIC_NAME, ARG_LABEL_NO_TIP);
tips_query_signals[SIGNAL_START_QUERY] =
gtk_signal_new (I_("start_query"),
gtk_signal_new (I_("start-query"),
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkTipsQueryClass, start_query),
_gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0);
tips_query_signals[SIGNAL_STOP_QUERY] =
gtk_signal_new (I_("stop_query"),
gtk_signal_new (I_("stop-query"),
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkTipsQueryClass, stop_query),
_gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0);
tips_query_signals[SIGNAL_WIDGET_ENTERED] =
gtk_signal_new (I_("widget_entered"),
gtk_signal_new (I_("widget-entered"),
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkTipsQueryClass, widget_entered),
@ -166,7 +166,7 @@ gtk_tips_query_class_init (GtkTipsQueryClass *class)
GTK_TYPE_STRING,
GTK_TYPE_STRING);
tips_query_signals[SIGNAL_WIDGET_SELECTED] =
g_signal_new (I_("widget_selected"),
g_signal_new (I_("widget-selected"),
G_TYPE_FROM_CLASS(object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkTipsQueryClass, widget_selected),

17
gtk/gtktoolbar.c
View File

@ -455,7 +455,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
* Return value: return %TRUE if the signal was handled, %FALSE if not
*/
toolbar_signals[POPUP_CONTEXT_MENU] =
g_signal_new (I_("popup_context_menu"),
g_signal_new (I_("popup-context-menu"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkToolbarClass, popup_context_menu),
@ -476,7 +476,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
* Return value: %TRUE if the signal was handled, %FALSE if not
*/
toolbar_signals[FOCUS_HOME_OR_END] =
g_signal_new_class_handler (I_("focus_home_or_end"),
g_signal_new_class_handler (I_("focus-home-or-end"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_toolbar_focus_home_or_end),
@ -655,16 +655,16 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
add_arrow_bindings (binding_set, GDK_Down, GTK_DIR_DOWN);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, 0,
"focus_home_or_end", 1,
"focus-home-or-end", 1,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_Home, 0,
"focus_home_or_end", 1,
"focus-home-or-end", 1,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_End, 0,
"focus_home_or_end", 1,
"focus-home-or-end", 1,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set, GDK_End, 0,
"focus_home_or_end", 1,
"focus-home-or-end", 1,
G_TYPE_BOOLEAN, FALSE);
add_ctrl_tab_bindings (binding_set, 0, GTK_DIR_TAB_FORWARD);
@ -691,7 +691,7 @@ gtk_toolbar_init (GtkToolbar *toolbar)
g_object_ref_sink (toolbar->tooltips);
priv->arrow_button = gtk_toggle_button_new ();
g_signal_connect (priv->arrow_button, "button_press_event",
g_signal_connect (priv->arrow_button, "button-press-event",
G_CALLBACK (gtk_toolbar_arrow_button_press), toolbar);
g_signal_connect (priv->arrow_button, "clicked",
G_CALLBACK (gtk_toolbar_arrow_button_clicked), toolbar);
@ -1385,7 +1385,8 @@ rebuild_menu (GtkToolbar *toolbar)
GTK_WIDGET (toolbar),
menu_detached);
g_signal_connect (priv->menu, "deactivate", G_CALLBACK (menu_deactivated), toolbar);
g_signal_connect (priv->menu, "deactivate",
G_CALLBACK (menu_deactivated), toolbar);
}
gtk_container_foreach (GTK_CONTAINER (priv->menu), remove_item, NULL);

6
gtk/gtktoolitem.c
View File

@ -202,7 +202,7 @@ gtk_tool_item_class_init (GtkToolItemClass *klass)
* Return value: %TRUE if the signal was handled, %FALSE if not
**/
toolitem_signals[CREATE_MENU_PROXY] =
g_signal_new (I_("create_menu_proxy"),
g_signal_new (I_("create-menu-proxy"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkToolItemClass, create_menu_proxy),
@ -227,7 +227,7 @@ gtk_tool_item_class_init (GtkToolItemClass *klass)
* themselves accordingly.
**/
toolitem_signals[TOOLBAR_RECONFIGURED] =
g_signal_new (I_("toolbar_reconfigured"),
g_signal_new (I_("toolbar-reconfigured"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkToolItemClass, toolbar_reconfigured),
@ -251,7 +251,7 @@ gtk_tool_item_class_init (GtkToolItemClass *klass)
* need to use this signal anymore.
**/
toolitem_signals[SET_TOOLTIP] =
g_signal_new (I_("set_tooltip"),
g_signal_new (I_("set-tooltip"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkToolItemClass, set_tooltip),

4
gtk/gtktreeitem.c
View File

@ -230,13 +230,13 @@ gtk_tree_item_init (GtkTreeItem *tree_item)
/* create an event box containing one pixmaps */
eventbox = gtk_event_box_new();
gtk_widget_set_events (eventbox, GDK_BUTTON_PRESS_MASK);
gtk_signal_connect(GTK_OBJECT(eventbox), "state_changed",
gtk_signal_connect(GTK_OBJECT(eventbox), "state-changed",
(GtkSignalFunc)gtk_tree_item_subtree_button_changed_state,
(gpointer)NULL);
gtk_signal_connect(GTK_OBJECT(eventbox), "realize",
(GtkSignalFunc)gtk_tree_item_subtree_button_changed_state,
(gpointer)NULL);
gtk_signal_connect(GTK_OBJECT(eventbox), "button_press_event",
gtk_signal_connect(GTK_OBJECT(eventbox), "button-press-event",
(GtkSignalFunc)gtk_tree_item_subtree_button_click,
(gpointer)NULL);
gtk_object_set_user_data(GTK_OBJECT(eventbox), tree_item);

10
gtk/gtktreemodelfilter.c
View File

@ -2733,23 +2733,23 @@ gtk_tree_model_filter_set_model (GtkTreeModelFilter *filter,
{
g_object_ref (filter->priv->child_model);
filter->priv->changed_id =
g_signal_connect (child_model, "row_changed",
g_signal_connect (child_model, "row-changed",
G_CALLBACK (gtk_tree_model_filter_row_changed),
filter);
filter->priv->inserted_id =
g_signal_connect (child_model, "row_inserted",
g_signal_connect (child_model, "row-inserted",
G_CALLBACK (gtk_tree_model_filter_row_inserted),
filter);
filter->priv->has_child_toggled_id =
g_signal_connect (child_model, "row_has_child_toggled",
g_signal_connect (child_model, "row-has-child-toggled",
G_CALLBACK (gtk_tree_model_filter_row_has_child_toggled),
filter);
filter->priv->deleted_id =
g_signal_connect (child_model, "row_deleted",
g_signal_connect (child_model, "row-deleted",
G_CALLBACK (gtk_tree_model_filter_row_deleted),
filter);
filter->priv->reordered_id =
g_signal_connect (child_model, "rows_reordered",
g_signal_connect (child_model, "rows-reordered",
G_CALLBACK (gtk_tree_model_filter_rows_reordered),
filter);

10
gtk/gtktreemodelsort.c
View File

@ -1917,23 +1917,23 @@ gtk_tree_model_sort_set_model (GtkTreeModelSort *tree_model_sort,
gint i, n_columns;
tree_model_sort->changed_id =
g_signal_connect (child_model, "row_changed",
g_signal_connect (child_model, "row-changed",
G_CALLBACK (gtk_tree_model_sort_row_changed),
tree_model_sort);
tree_model_sort->inserted_id =
g_signal_connect (child_model, "row_inserted",
g_signal_connect (child_model, "row-inserted",
G_CALLBACK (gtk_tree_model_sort_row_inserted),
tree_model_sort);
tree_model_sort->has_child_toggled_id =
g_signal_connect (child_model, "row_has_child_toggled",
g_signal_connect (child_model, "row-has-child-toggled",
G_CALLBACK (gtk_tree_model_sort_row_has_child_toggled),
tree_model_sort);
tree_model_sort->deleted_id =
g_signal_connect (child_model, "row_deleted",
g_signal_connect (child_model, "row-deleted",
G_CALLBACK (gtk_tree_model_sort_row_deleted),
tree_model_sort);
tree_model_sort->reordered_id =
g_signal_connect (child_model, "rows_reordered",
g_signal_connect (child_model, "rows-reordered",
G_CALLBACK (gtk_tree_model_sort_rows_reordered),
tree_model_sort);

6
gtk/gtktreeselection.c
View File

@ -637,13 +637,13 @@ gtk_tree_selection_selected_foreach (GtkTreeSelection *selection,
g_object_ref (model);
/* connect to signals to monitor changes in treemodel */
inserted_id = g_signal_connect_swapped (model, "row_inserted",
inserted_id = g_signal_connect_swapped (model, "row-inserted",
G_CALLBACK (model_changed),
&stop);
deleted_id = g_signal_connect_swapped (model, "row_deleted",
deleted_id = g_signal_connect_swapped (model, "row-deleted",
G_CALLBACK (model_changed),
&stop);
reordered_id = g_signal_connect_swapped (model, "rows_reordered",
reordered_id = g_signal_connect_swapped (model, "rows-reordered",
G_CALLBACK (model_changed),
&stop);
changed_id = g_signal_connect_swapped (selection->tree_view, "notify::model",

4
gtk/gtktreeviewcolumn.c
View File

@ -836,7 +836,7 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column)
gtk_widget_show (child);
}
g_signal_connect (child, "mnemonic_activate",
g_signal_connect (child, "mnemonic-activate",
G_CALLBACK (gtk_tree_view_column_mnemonic_activate),
tree_column);
@ -1209,7 +1209,7 @@ gtk_tree_view_column_setup_sort_column_id_callback (GtkTreeViewColumn *tree_colu
if (tree_column->sort_column_changed_signal == 0)
tree_column->sort_column_changed_signal =
g_signal_connect (model, "sort_column_changed",
g_signal_connect (model, "sort-column-changed",
G_CALLBACK (gtk_tree_view_model_sort_column_changed),
tree_column);