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

gtk/gtkaccellabel.c gtk/gtkaction.c gtk/gtkclist.c gtk/gtkcolorbutton.c

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

	* gtk/gtkaccellabel.c
	* gtk/gtkaction.c
	* gtk/gtkclist.c
	* gtk/gtkcolorbutton.c
	* gtk/gtkctree.c
	* gtk/gtkdialog.c
	* gtk/gtkdnd-quartz.c
	* gtk/gtkdnd.c
	* gtk/gtkentry.c
	* gtk/gtkfilechooserdefault.c
	* gtk/gtkfilesel.c
	* gtk/gtkgamma.c
	* gtk/gtkiconview.c
	* gtk/gtkkeyhash.c
	* gtk/gtklabel.c
	* gtk/gtkmenu.c
	* gtk/gtkmenubar.c
	* gtk/gtkpaned.c
	* gtk/gtkrecentchooserdialog.c
	* gtk/gtkrecentchooserutils.c
	* gtk/gtkselection.c
	* gtk/gtksizegroup.c
	* gtk/gtktextbtree.c
	* gtk/gtktextbuffer.c
	* gtk/gtktextview.c
	* gtk/gtktoolbar.c
	* gtk/gtktreemodel.c
	* gtk/gtkuimanager.c
	* gtk/gtkwindow-decorate.c
	* gtk/gtkwindow.c: use canonical signal names in some more places
	that I missed earlier. Also changed this in the documentation and
	comments.


svn path=/trunk/; revision=21094
This commit is contained in:
Sven Neumann 2008-08-12 14:37:03 +00:00 committed by Sven Neumann
parent 3818f47eb9
commit b699ac5853
31 changed files with 247 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ChangeLog
View File

@ -1,3 +1,38 @@
2008-08-12 Sven Neumann <sven@gimp.org>
* gtk/gtkaccellabel.c
* gtk/gtkaction.c
* gtk/gtkclist.c
* gtk/gtkcolorbutton.c
* gtk/gtkctree.c
* gtk/gtkdialog.c
* gtk/gtkdnd-quartz.c
* gtk/gtkdnd.c
* gtk/gtkentry.c
* gtk/gtkfilechooserdefault.c
* gtk/gtkfilesel.c
* gtk/gtkgamma.c
* gtk/gtkiconview.c
* gtk/gtkkeyhash.c
* gtk/gtklabel.c
* gtk/gtkmenu.c
* gtk/gtkmenubar.c
* gtk/gtkpaned.c
* gtk/gtkrecentchooserdialog.c
* gtk/gtkrecentchooserutils.c
* gtk/gtkselection.c
* gtk/gtksizegroup.c
* gtk/gtktextbtree.c
* gtk/gtktextbuffer.c
* gtk/gtktextview.c
* gtk/gtktoolbar.c
* gtk/gtktreemodel.c
* gtk/gtkuimanager.c
* gtk/gtkwindow-decorate.c
* gtk/gtkwindow.c: use canonical signal names in some more places
that I missed earlier. Also changed this in the documentation and
comments.
2008-08-12 Sven Neumann <sven@gimp.org> 2008-08-12 Sven Neumann <sven@gimp.org>
* gtk/gtknotebook.c * gtk/gtknotebook.c

4
gtk/gtkaccellabel.c
View File

@ -416,7 +416,7 @@ gtk_accel_label_set_accel_widget (GtkAccelLabel *accel_label,
if (accel_label->accel_widget) if (accel_label->accel_widget)
{ {
g_object_ref (accel_label->accel_widget); g_object_ref (accel_label->accel_widget);
g_signal_connect_object (accel_label->accel_widget, "accel_closures_changed", g_signal_connect_object (accel_label->accel_widget, "accel-closures-changed",
G_CALLBACK (refetch_widget_accel_closure), G_CALLBACK (refetch_widget_accel_closure),
accel_label, G_CONNECT_SWAPPED); accel_label, G_CONNECT_SWAPPED);
refetch_widget_accel_closure (accel_label); refetch_widget_accel_closure (accel_label);
@ -479,7 +479,7 @@ gtk_accel_label_set_accel_closure (GtkAccelLabel *accel_label,
{ {
g_closure_ref (accel_label->accel_closure); g_closure_ref (accel_label->accel_closure);
accel_label->accel_group = gtk_accel_group_from_accel_closure (accel_closure); accel_label->accel_group = gtk_accel_group_from_accel_closure (accel_closure);
g_signal_connect_object (accel_label->accel_group, "accel_changed", g_signal_connect_object (accel_label->accel_group, "accel-changed",
G_CALLBACK (check_accel_changed), G_CALLBACK (check_accel_changed),
accel_label, 0); accel_label, 0);
} }

2
gtk/gtkaction.c
View File

@ -799,7 +799,7 @@ connect_proxy (GtkAction *action,
gtk_action_sync_tooltip (action, proxy); gtk_action_sync_tooltip (action, proxy);
g_signal_connect_object (proxy, "create_menu_proxy", g_signal_connect_object (proxy, "create-menu-proxy",
G_CALLBACK (gtk_action_create_menu_proxy), G_CALLBACK (gtk_action_create_menu_proxy),
action, 0); action, 0);

124
gtk/gtkclist.c
View File

@ -612,7 +612,7 @@ gtk_clist_class_init (GtkCListClass *klass)
ARG_SORT_TYPE); ARG_SORT_TYPE);
widget_class->set_scroll_adjustments_signal = widget_class->set_scroll_adjustments_signal =
gtk_signal_new (I_("set_scroll_adjustments"), gtk_signal_new (I_("set-scroll-adjustments"),
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCListClass, set_scroll_adjustments), GTK_SIGNAL_OFFSET (GtkCListClass, set_scroll_adjustments),
@ -620,7 +620,7 @@ gtk_clist_class_init (GtkCListClass *klass)
GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
clist_signals[SELECT_ROW] = clist_signals[SELECT_ROW] =
gtk_signal_new (I_("select_row"), gtk_signal_new (I_("select-row"),
GTK_RUN_FIRST, GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCListClass, select_row), GTK_SIGNAL_OFFSET (GtkCListClass, select_row),
@ -630,7 +630,7 @@ gtk_clist_class_init (GtkCListClass *klass)
GTK_TYPE_INT, GTK_TYPE_INT,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
clist_signals[UNSELECT_ROW] = clist_signals[UNSELECT_ROW] =
gtk_signal_new (I_("unselect_row"), gtk_signal_new (I_("unselect-row"),
GTK_RUN_FIRST, GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCListClass, unselect_row), GTK_SIGNAL_OFFSET (GtkCListClass, unselect_row),
@ -638,21 +638,21 @@ gtk_clist_class_init (GtkCListClass *klass)
GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_NONE, 3, GTK_TYPE_INT,
GTK_TYPE_INT, GDK_TYPE_EVENT); GTK_TYPE_INT, GDK_TYPE_EVENT);
clist_signals[ROW_MOVE] = clist_signals[ROW_MOVE] =
gtk_signal_new (I_("row_move"), gtk_signal_new (I_("row-move"),
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCListClass, row_move), GTK_SIGNAL_OFFSET (GtkCListClass, row_move),
_gtk_marshal_VOID__INT_INT, _gtk_marshal_VOID__INT_INT,
GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT); GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
clist_signals[CLICK_COLUMN] = clist_signals[CLICK_COLUMN] =
gtk_signal_new (I_("click_column"), gtk_signal_new (I_("click-column"),
GTK_RUN_FIRST, GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCListClass, click_column), GTK_SIGNAL_OFFSET (GtkCListClass, click_column),
_gtk_marshal_VOID__INT, _gtk_marshal_VOID__INT,
GTK_TYPE_NONE, 1, GTK_TYPE_INT); GTK_TYPE_NONE, 1, GTK_TYPE_INT);
clist_signals[RESIZE_COLUMN] = clist_signals[RESIZE_COLUMN] =
gtk_signal_new (I_("resize_column"), gtk_signal_new (I_("resize-column"),
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCListClass, resize_column), GTK_SIGNAL_OFFSET (GtkCListClass, resize_column),
@ -660,56 +660,56 @@ gtk_clist_class_init (GtkCListClass *klass)
GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT); GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
clist_signals[TOGGLE_FOCUS_ROW] = clist_signals[TOGGLE_FOCUS_ROW] =
gtk_signal_new (I_("toggle_focus_row"), gtk_signal_new (I_("toggle-focus-row"),
GTK_RUN_LAST | GTK_RUN_ACTION, GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCListClass, toggle_focus_row), GTK_SIGNAL_OFFSET (GtkCListClass, toggle_focus_row),
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0); GTK_TYPE_NONE, 0);
clist_signals[SELECT_ALL] = clist_signals[SELECT_ALL] =
gtk_signal_new (I_("select_all"), gtk_signal_new (I_("select-all"),
GTK_RUN_LAST | GTK_RUN_ACTION, GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCListClass, select_all), GTK_SIGNAL_OFFSET (GtkCListClass, select_all),
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0); GTK_TYPE_NONE, 0);
clist_signals[UNSELECT_ALL] = clist_signals[UNSELECT_ALL] =
gtk_signal_new (I_("unselect_all"), gtk_signal_new (I_("unselect-all"),
GTK_RUN_LAST | GTK_RUN_ACTION, GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCListClass, unselect_all), GTK_SIGNAL_OFFSET (GtkCListClass, unselect_all),
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0); GTK_TYPE_NONE, 0);
clist_signals[UNDO_SELECTION] = clist_signals[UNDO_SELECTION] =
gtk_signal_new (I_("undo_selection"), gtk_signal_new (I_("undo-selection"),
GTK_RUN_LAST | GTK_RUN_ACTION, GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCListClass, undo_selection), GTK_SIGNAL_OFFSET (GtkCListClass, undo_selection),
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0); GTK_TYPE_NONE, 0);
clist_signals[START_SELECTION] = clist_signals[START_SELECTION] =
gtk_signal_new (I_("start_selection"), gtk_signal_new (I_("start-selection"),
GTK_RUN_LAST | GTK_RUN_ACTION, GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCListClass, start_selection), GTK_SIGNAL_OFFSET (GtkCListClass, start_selection),
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0); GTK_TYPE_NONE, 0);
clist_signals[END_SELECTION] = clist_signals[END_SELECTION] =
gtk_signal_new (I_("end_selection"), gtk_signal_new (I_("end-selection"),
GTK_RUN_LAST | GTK_RUN_ACTION, GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCListClass, end_selection), GTK_SIGNAL_OFFSET (GtkCListClass, end_selection),
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0); GTK_TYPE_NONE, 0);
clist_signals[TOGGLE_ADD_MODE] = clist_signals[TOGGLE_ADD_MODE] =
gtk_signal_new (I_("toggle_add_mode"), gtk_signal_new (I_("toggle-add-mode"),
GTK_RUN_LAST | GTK_RUN_ACTION, GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCListClass, toggle_add_mode), GTK_SIGNAL_OFFSET (GtkCListClass, toggle_add_mode),
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0); GTK_TYPE_NONE, 0);
clist_signals[EXTEND_SELECTION] = clist_signals[EXTEND_SELECTION] =
gtk_signal_new (I_("extend_selection"), gtk_signal_new (I_("extend-selection"),
GTK_RUN_LAST | GTK_RUN_ACTION, GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCListClass, extend_selection), GTK_SIGNAL_OFFSET (GtkCListClass, extend_selection),
@ -717,21 +717,21 @@ gtk_clist_class_init (GtkCListClass *klass)
GTK_TYPE_NONE, 3, GTK_TYPE_NONE, 3,
GTK_TYPE_SCROLL_TYPE, GTK_TYPE_FLOAT, GTK_TYPE_BOOL); GTK_TYPE_SCROLL_TYPE, GTK_TYPE_FLOAT, GTK_TYPE_BOOL);
clist_signals[SCROLL_VERTICAL] = clist_signals[SCROLL_VERTICAL] =
gtk_signal_new (I_("scroll_vertical"), gtk_signal_new (I_("scroll-vertical"),
GTK_RUN_LAST | GTK_RUN_ACTION, GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCListClass, scroll_vertical), GTK_SIGNAL_OFFSET (GtkCListClass, scroll_vertical),
_gtk_marshal_VOID__ENUM_FLOAT, _gtk_marshal_VOID__ENUM_FLOAT,
GTK_TYPE_NONE, 2, GTK_TYPE_SCROLL_TYPE, GTK_TYPE_FLOAT); GTK_TYPE_NONE, 2, GTK_TYPE_SCROLL_TYPE, GTK_TYPE_FLOAT);
clist_signals[SCROLL_HORIZONTAL] = clist_signals[SCROLL_HORIZONTAL] =
gtk_signal_new (I_("scroll_horizontal"), gtk_signal_new (I_("scroll-horizontal"),
GTK_RUN_LAST | GTK_RUN_ACTION, GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCListClass, scroll_horizontal), GTK_SIGNAL_OFFSET (GtkCListClass, scroll_horizontal),
_gtk_marshal_VOID__ENUM_FLOAT, _gtk_marshal_VOID__ENUM_FLOAT,
GTK_TYPE_NONE, 2, GTK_TYPE_SCROLL_TYPE, GTK_TYPE_FLOAT); GTK_TYPE_NONE, 2, GTK_TYPE_SCROLL_TYPE, GTK_TYPE_FLOAT);
clist_signals[ABORT_COLUMN_RESIZE] = clist_signals[ABORT_COLUMN_RESIZE] =
gtk_signal_new (I_("abort_column_resize"), gtk_signal_new (I_("abort-column-resize"),
GTK_RUN_LAST | GTK_RUN_ACTION, GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCListClass, abort_column_resize), GTK_SIGNAL_OFFSET (GtkCListClass, abort_column_resize),
@ -740,177 +740,177 @@ gtk_clist_class_init (GtkCListClass *klass)
binding_set = gtk_binding_set_by_class (klass); binding_set = gtk_binding_set_by_class (klass);
gtk_binding_entry_add_signal (binding_set, GDK_Up, 0, gtk_binding_entry_add_signal (binding_set, GDK_Up, 0,
"scroll_vertical", 2, "scroll-vertical", 2,
GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD, GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
GTK_TYPE_FLOAT, 0.0); GTK_TYPE_FLOAT, 0.0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, 0, gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, 0,
"scroll_vertical", 2, "scroll-vertical", 2,
GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD, GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
GTK_TYPE_FLOAT, 0.0); GTK_TYPE_FLOAT, 0.0);
gtk_binding_entry_add_signal (binding_set, GDK_Down, 0, gtk_binding_entry_add_signal (binding_set, GDK_Down, 0,
"scroll_vertical", 2, "scroll-vertical", 2,
GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD, GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
GTK_TYPE_FLOAT, 0.0); GTK_TYPE_FLOAT, 0.0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, 0, gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, 0,
"scroll_vertical", 2, "scroll-vertical", 2,
GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD, GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
GTK_TYPE_FLOAT, 0.0); GTK_TYPE_FLOAT, 0.0);
gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, 0, gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, 0,
"scroll_vertical", 2, "scroll-vertical", 2,
GTK_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD, GTK_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD,
GTK_TYPE_FLOAT, 0.0); GTK_TYPE_FLOAT, 0.0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Up, 0, gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Up, 0,
"scroll_vertical", 2, "scroll-vertical", 2,
GTK_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD, GTK_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD,
GTK_TYPE_FLOAT, 0.0); GTK_TYPE_FLOAT, 0.0);
gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, 0, gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, 0,
"scroll_vertical", 2, "scroll-vertical", 2,
GTK_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD, GTK_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
GTK_TYPE_FLOAT, 0.0); GTK_TYPE_FLOAT, 0.0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Down, 0, gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Down, 0,
"scroll_vertical", 2, "scroll-vertical", 2,
GTK_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD, GTK_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
GTK_TYPE_FLOAT, 0.0); GTK_TYPE_FLOAT, 0.0);
gtk_binding_entry_add_signal (binding_set, GDK_Home, GDK_CONTROL_MASK, gtk_binding_entry_add_signal (binding_set, GDK_Home, GDK_CONTROL_MASK,
"scroll_vertical", 2, "scroll-vertical", 2,
GTK_TYPE_ENUM, GTK_SCROLL_JUMP, GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
GTK_TYPE_FLOAT, 0.0); GTK_TYPE_FLOAT, 0.0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, GDK_CONTROL_MASK, gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, GDK_CONTROL_MASK,
"scroll_vertical", 2, "scroll-vertical", 2,
GTK_TYPE_ENUM, GTK_SCROLL_JUMP, GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
GTK_TYPE_FLOAT, 0.0); GTK_TYPE_FLOAT, 0.0);
gtk_binding_entry_add_signal (binding_set, GDK_End, GDK_CONTROL_MASK, gtk_binding_entry_add_signal (binding_set, GDK_End, GDK_CONTROL_MASK,
"scroll_vertical", 2, "scroll-vertical", 2,
GTK_TYPE_ENUM, GTK_SCROLL_JUMP, GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
GTK_TYPE_FLOAT, 1.0); GTK_TYPE_FLOAT, 1.0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_End, GDK_CONTROL_MASK, gtk_binding_entry_add_signal (binding_set, GDK_KP_End, GDK_CONTROL_MASK,
"scroll_vertical", 2, "scroll-vertical", 2,
GTK_TYPE_ENUM, GTK_SCROLL_JUMP, GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
GTK_TYPE_FLOAT, 1.0); GTK_TYPE_FLOAT, 1.0);
gtk_binding_entry_add_signal (binding_set, GDK_Up, GDK_SHIFT_MASK, gtk_binding_entry_add_signal (binding_set, GDK_Up, GDK_SHIFT_MASK,
"extend_selection", 3, "extend-selection", 3,
GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD, GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE); GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, GDK_SHIFT_MASK, gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, GDK_SHIFT_MASK,
"extend_selection", 3, "extend-selection", 3,
GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD, GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE); GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_Down, GDK_SHIFT_MASK, gtk_binding_entry_add_signal (binding_set, GDK_Down, GDK_SHIFT_MASK,
"extend_selection", 3, "extend-selection", 3,
GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD, GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE); GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, GDK_SHIFT_MASK, gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, GDK_SHIFT_MASK,
"extend_selection", 3, "extend-selection", 3,
GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD, GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE); GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, GDK_SHIFT_MASK, gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, GDK_SHIFT_MASK,
"extend_selection", 3, "extend-selection", 3,
GTK_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD, GTK_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD,
GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE); GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Up, GDK_SHIFT_MASK, gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Up, GDK_SHIFT_MASK,
"extend_selection", 3, "extend-selection", 3,
GTK_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD, GTK_TYPE_ENUM, GTK_SCROLL_PAGE_BACKWARD,
GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE); GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, GDK_SHIFT_MASK, gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, GDK_SHIFT_MASK,
"extend_selection", 3, "extend-selection", 3,
GTK_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD, GTK_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE); GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Down, GDK_SHIFT_MASK, gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Down, GDK_SHIFT_MASK,
"extend_selection", 3, "extend-selection", 3,
GTK_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD, GTK_TYPE_ENUM, GTK_SCROLL_PAGE_FORWARD,
GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE); GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_Home, gtk_binding_entry_add_signal (binding_set, GDK_Home,
GDK_SHIFT_MASK | GDK_CONTROL_MASK, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"extend_selection", 3, "extend-selection", 3,
GTK_TYPE_ENUM, GTK_SCROLL_JUMP, GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE); GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, gtk_binding_entry_add_signal (binding_set, GDK_KP_Home,
GDK_SHIFT_MASK | GDK_CONTROL_MASK, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"extend_selection", 3, "extend-selection", 3,
GTK_TYPE_ENUM, GTK_SCROLL_JUMP, GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE); GTK_TYPE_FLOAT, 0.0, GTK_TYPE_BOOL, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_End, gtk_binding_entry_add_signal (binding_set, GDK_End,
GDK_SHIFT_MASK | GDK_CONTROL_MASK, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"extend_selection", 3, "extend-selection", 3,
GTK_TYPE_ENUM, GTK_SCROLL_JUMP, GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
GTK_TYPE_FLOAT, 1.0, GTK_TYPE_BOOL, TRUE); GTK_TYPE_FLOAT, 1.0, GTK_TYPE_BOOL, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KP_End, gtk_binding_entry_add_signal (binding_set, GDK_KP_End,
GDK_SHIFT_MASK | GDK_CONTROL_MASK, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"extend_selection", 3, "extend-selection", 3,
GTK_TYPE_ENUM, GTK_SCROLL_JUMP, GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
GTK_TYPE_FLOAT, 1.0, GTK_TYPE_BOOL, TRUE); GTK_TYPE_FLOAT, 1.0, GTK_TYPE_BOOL, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_Left, 0, gtk_binding_entry_add_signal (binding_set, GDK_Left, 0,
"scroll_horizontal", 2, "scroll-horizontal", 2,
GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD, GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
GTK_TYPE_FLOAT, 0.0); GTK_TYPE_FLOAT, 0.0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, 0, gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, 0,
"scroll_horizontal", 2, "scroll-horizontal", 2,
GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD, GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
GTK_TYPE_FLOAT, 0.0); GTK_TYPE_FLOAT, 0.0);
gtk_binding_entry_add_signal (binding_set, GDK_Right, 0, gtk_binding_entry_add_signal (binding_set, GDK_Right, 0,
"scroll_horizontal", 2, "scroll-horizontal", 2,
GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD, GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
GTK_TYPE_FLOAT, 0.0); GTK_TYPE_FLOAT, 0.0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, 0, gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, 0,
"scroll_horizontal", 2, "scroll-horizontal", 2,
GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD, GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
GTK_TYPE_FLOAT, 0.0); GTK_TYPE_FLOAT, 0.0);
gtk_binding_entry_add_signal (binding_set, GDK_Home, 0, gtk_binding_entry_add_signal (binding_set, GDK_Home, 0,
"scroll_horizontal", 2, "scroll-horizontal", 2,
GTK_TYPE_ENUM, GTK_SCROLL_JUMP, GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
GTK_TYPE_FLOAT, 0.0); GTK_TYPE_FLOAT, 0.0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, 0, gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, 0,
"scroll_horizontal", 2, "scroll-horizontal", 2,
GTK_TYPE_ENUM, GTK_SCROLL_JUMP, GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
GTK_TYPE_FLOAT, 0.0); GTK_TYPE_FLOAT, 0.0);
gtk_binding_entry_add_signal (binding_set, GDK_End, 0, gtk_binding_entry_add_signal (binding_set, GDK_End, 0,
"scroll_horizontal", 2, "scroll-horizontal", 2,
GTK_TYPE_ENUM, GTK_SCROLL_JUMP, GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
GTK_TYPE_FLOAT, 1.0); GTK_TYPE_FLOAT, 1.0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_End, 0, gtk_binding_entry_add_signal (binding_set, GDK_KP_End, 0,
"scroll_horizontal", 2, "scroll-horizontal", 2,
GTK_TYPE_ENUM, GTK_SCROLL_JUMP, GTK_TYPE_ENUM, GTK_SCROLL_JUMP,
GTK_TYPE_FLOAT, 1.0); GTK_TYPE_FLOAT, 1.0);
gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0,
"undo_selection", 0); "undo-selection", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0,
"abort_column_resize", 0); "abort-column-resize", 0);
gtk_binding_entry_add_signal (binding_set, GDK_space, 0, gtk_binding_entry_add_signal (binding_set, GDK_space, 0,
"toggle_focus_row", 0); "toggle-focus-row", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, 0, gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, 0,
"toggle_focus_row", 0); "toggle-focus-row", 0);
gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK, gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK,
"toggle_add_mode", 0); "toggle-add-mode", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, GDK_CONTROL_MASK, gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, GDK_CONTROL_MASK,
"toggle_add_mode", 0); "toggle-add-mode", 0);
gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK, gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
"select_all", 0); "select-all", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Divide, GDK_CONTROL_MASK, gtk_binding_entry_add_signal (binding_set, GDK_KP_Divide, GDK_CONTROL_MASK,
"select_all", 0); "select-all", 0);
gtk_binding_entry_add_signal (binding_set, '\\', GDK_CONTROL_MASK, gtk_binding_entry_add_signal (binding_set, '\\', GDK_CONTROL_MASK,
"unselect_all", 0); "unselect-all", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Shift_L, gtk_binding_entry_add_signal (binding_set, GDK_Shift_L,
GDK_RELEASE_MASK | GDK_SHIFT_MASK, GDK_RELEASE_MASK | GDK_SHIFT_MASK,
"end_selection", 0); "end-selection", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Shift_R, gtk_binding_entry_add_signal (binding_set, GDK_Shift_R,
GDK_RELEASE_MASK | GDK_SHIFT_MASK, GDK_RELEASE_MASK | GDK_SHIFT_MASK,
"end_selection", 0); "end-selection", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Shift_L, gtk_binding_entry_add_signal (binding_set, GDK_Shift_L,
GDK_RELEASE_MASK | GDK_SHIFT_MASK | GDK_RELEASE_MASK | GDK_SHIFT_MASK |
GDK_CONTROL_MASK, GDK_CONTROL_MASK,
"end_selection", 0); "end-selection", 0);
gtk_binding_entry_add_signal (binding_set, GDK_Shift_R, gtk_binding_entry_add_signal (binding_set, GDK_Shift_R,
GDK_RELEASE_MASK | GDK_SHIFT_MASK | GDK_RELEASE_MASK | GDK_SHIFT_MASK |
GDK_CONTROL_MASK, GDK_CONTROL_MASK,
"end_selection", 0); "end-selection", 0);
} }
static void static void

6
gtk/gtkcolorbutton.c
View File

@ -582,11 +582,11 @@ gtk_color_button_init (GtkColorButton *color_button)
GDK_BUTTON1_MASK|GDK_BUTTON3_MASK, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK,
drop_types, 1, drop_types, 1,
GDK_ACTION_COPY); GDK_ACTION_COPY);
g_signal_connect (color_button, "drag_begin", g_signal_connect (color_button, "drag-begin",
G_CALLBACK (gtk_color_button_drag_begin), color_button); G_CALLBACK (gtk_color_button_drag_begin), color_button);
g_signal_connect (color_button, "drag_data_received", g_signal_connect (color_button, "drag-data-received",
G_CALLBACK (gtk_color_button_drag_data_received), color_button); G_CALLBACK (gtk_color_button_drag_data_received), color_button);
g_signal_connect (color_button, "drag_data_get", g_signal_connect (color_button, "drag-data-get",
G_CALLBACK (gtk_color_button_drag_data_get), color_button); G_CALLBACK (gtk_color_button_drag_data_get), color_button);
gtk_widget_pop_composite_child (); gtk_widget_pop_composite_child ();

40
gtk/gtkctree.c
View File

@ -438,7 +438,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
ARG_EXPANDER_STYLE); ARG_EXPANDER_STYLE);
ctree_signals[TREE_SELECT_ROW] = ctree_signals[TREE_SELECT_ROW] =
gtk_signal_new (I_("tree_select_row"), gtk_signal_new (I_("tree-select-row"),
GTK_RUN_FIRST, GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_select_row), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_select_row),
@ -447,7 +447,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
GTK_TYPE_CTREE_NODE, GTK_TYPE_CTREE_NODE,
GTK_TYPE_INT); GTK_TYPE_INT);
ctree_signals[TREE_UNSELECT_ROW] = ctree_signals[TREE_UNSELECT_ROW] =
gtk_signal_new (I_("tree_unselect_row"), gtk_signal_new (I_("tree-unselect-row"),
GTK_RUN_FIRST, GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_unselect_row), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_unselect_row),
@ -456,7 +456,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
GTK_TYPE_CTREE_NODE, GTK_TYPE_CTREE_NODE,
GTK_TYPE_INT); GTK_TYPE_INT);
ctree_signals[TREE_EXPAND] = ctree_signals[TREE_EXPAND] =
gtk_signal_new (I_("tree_expand"), gtk_signal_new (I_("tree-expand"),
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_expand), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_expand),
@ -464,7 +464,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
GTK_TYPE_NONE, 1, GTK_TYPE_NONE, 1,
GTK_TYPE_CTREE_NODE); GTK_TYPE_CTREE_NODE);
ctree_signals[TREE_COLLAPSE] = ctree_signals[TREE_COLLAPSE] =
gtk_signal_new (I_("tree_collapse"), gtk_signal_new (I_("tree-collapse"),
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_collapse), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_collapse),
@ -472,7 +472,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
GTK_TYPE_NONE, 1, GTK_TYPE_NONE, 1,
GTK_TYPE_CTREE_NODE); GTK_TYPE_CTREE_NODE);
ctree_signals[TREE_MOVE] = ctree_signals[TREE_MOVE] =
gtk_signal_new (I_("tree_move"), gtk_signal_new (I_("tree-move"),
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_move), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_move),
@ -482,7 +482,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
GTK_TYPE_CTREE_NODE, GTK_TYPE_CTREE_NODE,
GTK_TYPE_CTREE_NODE); GTK_TYPE_CTREE_NODE);
ctree_signals[CHANGE_FOCUS_ROW_EXPANSION] = ctree_signals[CHANGE_FOCUS_ROW_EXPANSION] =
gtk_signal_new (I_("change_focus_row_expansion"), gtk_signal_new (I_("change-focus-row-expansion"),
GTK_RUN_LAST | GTK_RUN_ACTION, GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCTreeClass, GTK_SIGNAL_OFFSET (GtkCTreeClass,
@ -493,64 +493,64 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
binding_set = gtk_binding_set_by_class (klass); binding_set = gtk_binding_set_by_class (klass);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_plus, 0, GDK_plus, 0,
"change_focus_row_expansion", 1, "change-focus-row-expansion", 1,
GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND); GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_plus, GDK_CONTROL_MASK, GDK_plus, GDK_CONTROL_MASK,
"change_focus_row_expansion", 1, "change-focus-row-expansion", 1,
GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND_RECURSIVE); GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND_RECURSIVE);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_KP_Add, 0, GDK_KP_Add, 0,
"change_focus_row_expansion", 1, "change-focus-row-expansion", 1,
GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND); GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_KP_Add, GDK_CONTROL_MASK, GDK_KP_Add, GDK_CONTROL_MASK,
"change_focus_row_expansion", 1, "change-focus-row-expansion", 1,
GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND_RECURSIVE); GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND_RECURSIVE);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_minus, 0, GDK_minus, 0,
"change_focus_row_expansion", 1, "change-focus-row-expansion", 1,
GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_COLLAPSE); GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_COLLAPSE);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_minus, GDK_CONTROL_MASK, GDK_minus, GDK_CONTROL_MASK,
"change_focus_row_expansion", 1, "change-focus-row-expansion", 1,
GTK_TYPE_ENUM, GTK_TYPE_ENUM,
GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE); GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_KP_Subtract, 0, GDK_KP_Subtract, 0,
"change_focus_row_expansion", 1, "change-focus-row-expansion", 1,
GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_COLLAPSE); GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_COLLAPSE);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_KP_Subtract, GDK_CONTROL_MASK, GDK_KP_Subtract, GDK_CONTROL_MASK,
"change_focus_row_expansion", 1, "change-focus-row-expansion", 1,
GTK_TYPE_ENUM, GTK_TYPE_ENUM,
GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE); GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_equal, 0, GDK_equal, 0,
"change_focus_row_expansion", 1, "change-focus-row-expansion", 1,
GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE); GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_KP_Equal, 0, GDK_KP_Equal, 0,
"change_focus_row_expansion", 1, "change-focus-row-expansion", 1,
GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE); GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_KP_Multiply, 0, GDK_KP_Multiply, 0,
"change_focus_row_expansion", 1, "change-focus-row-expansion", 1,
GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE); GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_asterisk, 0, GDK_asterisk, 0,
"change_focus_row_expansion", 1, "change-focus-row-expansion", 1,
GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE); GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_KP_Multiply, GDK_CONTROL_MASK, GDK_KP_Multiply, GDK_CONTROL_MASK,
"change_focus_row_expansion", 1, "change-focus-row-expansion", 1,
GTK_TYPE_ENUM, GTK_TYPE_ENUM,
GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE); GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_asterisk, GDK_CONTROL_MASK, GDK_asterisk, GDK_CONTROL_MASK,
"change_focus_row_expansion", 1, "change-focus-row-expansion", 1,
GTK_TYPE_ENUM, GTK_TYPE_ENUM,
GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE); GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE);
} }

2
gtk/gtkdialog.c
View File

@ -253,7 +253,7 @@ gtk_dialog_init (GtkDialog *dialog)
* connection on the dialog. * connection on the dialog.
*/ */
g_signal_connect (dialog, g_signal_connect (dialog,
"delete_event", "delete-event",
G_CALLBACK (gtk_dialog_delete_event_handler), G_CALLBACK (gtk_dialog_delete_event_handler),
NULL); NULL);

8
gtk/gtkdnd-quartz.c
View File

@ -721,7 +721,7 @@ gtk_drag_find_widget (GtkWidget *widget,
new_data.toplevel = FALSE; new_data.toplevel = FALSE;
/* need to reference children temporarily in case the /* need to reference children temporarily in case the
* ::drag_motion/::drag_drop callbacks change the widget heirarchy. * ::drag-motion/::drag-drop callbacks change the widget hierarchy.
*/ */
gtk_container_forall (GTK_CONTAINER (widget), prepend_and_ref_widget, &children); gtk_container_forall (GTK_CONTAINER (widget), prepend_and_ref_widget, &children);
for (tmp_list = children; tmp_list; tmp_list = tmp_list->next) for (tmp_list = children; tmp_list; tmp_list = tmp_list->next)
@ -736,7 +736,7 @@ gtk_drag_find_widget (GtkWidget *widget,
} }
/* If not, and this widget is registered as a drop site, check to /* If not, and this widget is registered as a drop site, check to
* emit "drag_motion" to check if we are actually in * emit "drag-motion" to check if we are actually in
* a drop site. * a drop site.
*/ */
if (!data->found && if (!data->found &&
@ -747,7 +747,7 @@ gtk_drag_find_widget (GtkWidget *widget,
data->x - x_offset - allocation_to_window_x, data->x - x_offset - allocation_to_window_x,
data->y - y_offset - allocation_to_window_y, data->y - y_offset - allocation_to_window_y,
data->time); data->time);
/* If so, send a "drag_leave" to the last widget */ /* If so, send a "drag-leave" to the last widget */
if (data->found) if (data->found)
{ {
if (data->info->widget && data->info->widget != widget) if (data->info->widget && data->info->widget != widget)
@ -1550,7 +1550,7 @@ gtk_drag_source_set_icon_name (GtkWidget *widget,
* *
* Changes the icon for a widget to a given widget. GTK+ * Changes the icon for a widget to a given widget. GTK+
* will not destroy the icon, so if you don't want * will not destroy the icon, so if you don't want
* it to persist, you should connect to the "drag_end" * it to persist, you should connect to the "drag-end"
* signal and destroy it yourself. * signal and destroy it yourself.
**/ **/
void void

16
gtk/gtkdnd.c
View File

@ -1753,7 +1753,7 @@ gtk_drag_find_widget (GtkWidget *widget,
new_data.toplevel = FALSE; new_data.toplevel = FALSE;
/* need to reference children temporarily in case the /* need to reference children temporarily in case the
* ::drag_motion/::drag_drop callbacks change the widget heirarchy. * ::drag-motion/::drag-drop callbacks change the widget hierarchy.
*/ */
gtk_container_forall (GTK_CONTAINER (widget), prepend_and_ref_widget, &children); gtk_container_forall (GTK_CONTAINER (widget), prepend_and_ref_widget, &children);
for (tmp_list = children; tmp_list; tmp_list = tmp_list->next) for (tmp_list = children; tmp_list; tmp_list = tmp_list->next)
@ -1768,7 +1768,7 @@ gtk_drag_find_widget (GtkWidget *widget,
} }
/* If not, and this widget is registered as a drop site, check to /* If not, and this widget is registered as a drop site, check to
* emit "drag_motion" to check if we are actually in * emit "drag-motion" to check if we are actually in
* a drop site. * a drop site.
*/ */
if (!data->found && if (!data->found &&
@ -1779,7 +1779,7 @@ gtk_drag_find_widget (GtkWidget *widget,
data->x - x_offset - allocation_to_window_x, data->x - x_offset - allocation_to_window_x,
data->y - y_offset - allocation_to_window_y, data->y - y_offset - allocation_to_window_y,
data->time); data->time);
/* If so, send a "drag_leave" to the last widget */ /* If so, send a "drag-leave" to the last widget */
if (data->found) if (data->found)
{ {
if (data->info->widget && data->info->widget != widget) if (data->info->widget && data->info->widget != widget)
@ -2265,7 +2265,7 @@ gtk_drag_begin_internal (GtkWidget *widget,
info->icon_window = NULL; info->icon_window = NULL;
info->destroy_icon = FALSE; info->destroy_icon = FALSE;
/* Set cur_x, cur_y here so if the "drag_begin" signal shows /* Set cur_x, cur_y here so if the "drag-begin" signal shows
* the drag icon, it will be in the right place * the drag icon, it will be in the right place
*/ */
if (event && event->type == GDK_MOTION_NOTIFY) if (event && event->type == GDK_MOTION_NOTIFY)
@ -2927,7 +2927,7 @@ gtk_drag_set_icon_window (GdkDragContext *context,
* *
* Changes the icon for a widget to a given widget. GTK+ * Changes the icon for a widget to a given widget. GTK+
* will not destroy the icon, so if you don't want * will not destroy the icon, so if you don't want
* it to persist, you should connect to the "drag_end" * it to persist, you should connect to the "drag-end"
* signal and destroy it yourself. * signal and destroy it yourself.
**/ **/
void void
@ -4011,7 +4011,7 @@ gtk_drag_cancel (GtkDragSourceInfo *info, GtkDragResult result, guint32 time)
/************************************************************* /*************************************************************
* gtk_drag_motion_cb: * gtk_drag_motion_cb:
* "motion_notify_event" callback during drag. * "motion-notify-event" callback during drag.
* arguments: * arguments:
* *
* results: * results:
@ -4044,7 +4044,7 @@ gtk_drag_motion_cb (GtkWidget *widget,
/************************************************************* /*************************************************************
* gtk_drag_key_cb: * gtk_drag_key_cb:
* "key_press/release_event" callback during drag. * "key-press/release-event" callback during drag.
* arguments: * arguments:
* *
* results: * results:
@ -4170,7 +4170,7 @@ gtk_drag_grab_notify_cb (GtkWidget *widget,
/************************************************************* /*************************************************************
* gtk_drag_button_release_cb: * gtk_drag_button_release_cb:
* "button_release_event" callback during drag. * "button-release-event" callback during drag.
* arguments: * arguments:
* *
* results: * results:

6
gtk/gtkentry.c
View File

@ -5331,11 +5331,11 @@ popup_targets_received (GtkClipboard *clipboard,
GTK_WIDGET (entry), GTK_WIDGET (entry),
popup_menu_detach); popup_menu_detach);
append_action_signal (entry, entry->popup_menu, GTK_STOCK_CUT, "cut_clipboard", append_action_signal (entry, entry->popup_menu, GTK_STOCK_CUT, "cut-clipboard",
entry->editable && entry->current_pos != entry->selection_bound); entry->editable && entry->current_pos != entry->selection_bound);
append_action_signal (entry, entry->popup_menu, GTK_STOCK_COPY, "copy_clipboard", append_action_signal (entry, entry->popup_menu, GTK_STOCK_COPY, "copy-clipboard",
entry->current_pos != entry->selection_bound); entry->current_pos != entry->selection_bound);
append_action_signal (entry, entry->popup_menu, GTK_STOCK_PASTE, "paste_clipboard", append_action_signal (entry, entry->popup_menu, GTK_STOCK_PASTE, "paste-clipboard",
entry->editable && clipboard_contains_text); entry->editable && clipboard_contains_text);
menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_DELETE, NULL); menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_DELETE, NULL);

16
gtk/gtkfilechooserdefault.c
View File

@ -3061,7 +3061,7 @@ shortcuts_drag_data_delete_cb (GtkWidget *widget,
GdkDragContext *context, GdkDragContext *context,
GtkFileChooserDefault *impl) GtkFileChooserDefault *impl)
{ {
g_signal_stop_emission_by_name (widget, "drag_data_delete"); g_signal_stop_emission_by_name (widget, "drag-data-delete");
} }
#if 0 #if 0
@ -3248,7 +3248,7 @@ shortcuts_drag_leave_cb (GtkWidget *widget,
NULL, NULL,
GTK_TREE_VIEW_DROP_BEFORE); GTK_TREE_VIEW_DROP_BEFORE);
g_signal_stop_emission_by_name (widget, "drag_leave"); g_signal_stop_emission_by_name (widget, "drag-leave");
} }
/* Computes the appropriate row and position for dropping */ /* Computes the appropriate row and position for dropping */
@ -3356,7 +3356,7 @@ shortcuts_drag_motion_cb (GtkWidget *widget,
out: out:
g_signal_stop_emission_by_name (widget, "drag_motion"); g_signal_stop_emission_by_name (widget, "drag-motion");
if (action != 0) if (action != 0)
{ {
@ -3380,7 +3380,7 @@ shortcuts_drag_drop_cb (GtkWidget *widget,
shortcuts_cancel_drag_outside_idle (impl); shortcuts_cancel_drag_outside_idle (impl);
#endif #endif
g_signal_stop_emission_by_name (widget, "drag_drop"); g_signal_stop_emission_by_name (widget, "drag-drop");
return TRUE; return TRUE;
} }
@ -3515,7 +3515,7 @@ shortcuts_drag_data_received_cb (GtkWidget *widget,
else if (selection_data->target == gdk_atom_intern_static_string ("GTK_TREE_MODEL_ROW")) else if (selection_data->target == gdk_atom_intern_static_string ("GTK_TREE_MODEL_ROW"))
shortcuts_reorder (impl, position); shortcuts_reorder (impl, position);
g_signal_stop_emission_by_name (widget, "drag_data_received"); g_signal_stop_emission_by_name (widget, "drag-data-received");
} }
/* Callback used to display a tooltip in the shortcuts tree */ /* Callback used to display a tooltip in the shortcuts tree */
@ -4215,7 +4215,7 @@ file_list_drag_data_received_cb (GtkWidget *widget,
data); data);
} }
g_signal_stop_emission_by_name (widget, "drag_data_received"); g_signal_stop_emission_by_name (widget, "drag-data-received");
} }
/* Don't do anything with the drag_drop signal */ /* Don't do anything with the drag_drop signal */
@ -4227,7 +4227,7 @@ file_list_drag_drop_cb (GtkWidget *widget,
guint time_, guint time_,
GtkFileChooserDefault *impl) GtkFileChooserDefault *impl)
{ {
g_signal_stop_emission_by_name (widget, "drag_drop"); g_signal_stop_emission_by_name (widget, "drag-drop");
return TRUE; return TRUE;
} }
@ -4241,7 +4241,7 @@ file_list_drag_motion_cb (GtkWidget *widget,
guint time_, guint time_,
GtkFileChooserDefault *impl) GtkFileChooserDefault *impl)
{ {
g_signal_stop_emission_by_name (widget, "drag_motion"); g_signal_stop_emission_by_name (widget, "drag-motion");
return TRUE; return TRUE;
} }

2
gtk/gtkfilesel.c
View File

@ -1720,7 +1720,7 @@ gtk_file_selection_insert_text (GtkWidget *widget,
if (!filename) if (!filename)
{ {
gdk_display_beep (gtk_widget_get_display (widget)); gdk_display_beep (gtk_widget_get_display (widget));
g_signal_stop_emission_by_name (widget, "insert_text"); g_signal_stop_emission_by_name (widget, "insert-text");
return FALSE; return FALSE;
} }

2
gtk/gtkgamma.c
View File

@ -262,7 +262,7 @@ gtk_gamma_curve_init (GtkGammaCurve *curve)
gtk_container_add (GTK_CONTAINER (curve), curve->table); gtk_container_add (GTK_CONTAINER (curve), curve->table);
curve->curve = gtk_curve_new (); curve->curve = gtk_curve_new ();
g_signal_connect (curve->curve, "curve_type_changed", g_signal_connect (curve->curve, "curve-type-changed",
G_CALLBACK (curve_type_changed_callback), curve); G_CALLBACK (curve_type_changed_callback), curve);
gtk_table_attach_defaults (GTK_TABLE (curve->table), curve->curve, 0, 1, 0, 1); gtk_table_attach_defaults (GTK_TABLE (curve->table), curve->curve, 0, 1, 0, 1);

8
gtk/gtkiconview.c
View File

@ -1784,7 +1784,7 @@ gtk_icon_view_start_editing (GtkIconView *icon_view,
gtk_cell_editable_start_editing (GTK_CELL_EDITABLE (editable), gtk_cell_editable_start_editing (GTK_CELL_EDITABLE (editable),
(GdkEvent *)event); (GdkEvent *)event);
gtk_widget_grab_focus (GTK_WIDGET (editable)); gtk_widget_grab_focus (GTK_WIDGET (editable));
g_signal_connect (editable, "remove_widget", g_signal_connect (editable, "remove-widget",
G_CALLBACK (gtk_icon_view_remove_widget), G_CALLBACK (gtk_icon_view_remove_widget),
icon_view); icon_view);
@ -6634,7 +6634,7 @@ gtk_icon_view_drag_data_delete (GtkWidget *widget,
icon_view = GTK_ICON_VIEW (widget); icon_view = GTK_ICON_VIEW (widget);
model = gtk_icon_view_get_model (icon_view); model = gtk_icon_view_get_model (icon_view);
if (!check_model_dnd (model, GTK_TYPE_TREE_DRAG_SOURCE, "drag_data_delete")) if (!check_model_dnd (model, GTK_TYPE_TREE_DRAG_SOURCE, "drag-data-delete"))
return; return;
if (!icon_view->priv->dest_set) if (!icon_view->priv->dest_set)
@ -6751,7 +6751,7 @@ gtk_icon_view_drag_drop (GtkWidget *widget,
if (!icon_view->priv->dest_set) if (!icon_view->priv->dest_set)
return FALSE; return FALSE;
if (!check_model_dnd (model, GTK_TYPE_TREE_DRAG_DEST, "drag_drop")) if (!check_model_dnd (model, GTK_TYPE_TREE_DRAG_DEST, "drag-drop"))
return FALSE; return FALSE;
if (!set_destination (icon_view, context, x, y, &suggested_action, &target)) if (!set_destination (icon_view, context, x, y, &suggested_action, &target))
@ -6804,7 +6804,7 @@ gtk_icon_view_drag_data_received (GtkWidget *widget,
icon_view = GTK_ICON_VIEW (widget); icon_view = GTK_ICON_VIEW (widget);
model = gtk_icon_view_get_model (icon_view); model = gtk_icon_view_get_model (icon_view);
if (!check_model_dnd (model, GTK_TYPE_TREE_DRAG_DEST, "drag_data_received")) if (!check_model_dnd (model, GTK_TYPE_TREE_DRAG_DEST, "drag-data-received"))
return; return;
if (!icon_view->priv->dest_set) if (!icon_view->priv->dest_set)

2
gtk/gtkkeyhash.c
View File

@ -128,7 +128,7 @@ _gtk_key_hash_new (GdkKeymap *keymap,
GtkKeyHash *key_hash = g_new (GtkKeyHash, 1); GtkKeyHash *key_hash = g_new (GtkKeyHash, 1);
key_hash->keymap = keymap; key_hash->keymap = keymap;
g_signal_connect (keymap, "keys_changed", g_signal_connect (keymap, "keys-changed",
G_CALLBACK (key_hash_keys_changed), key_hash); G_CALLBACK (key_hash_keys_changed), key_hash);
key_hash->entries_list = NULL; key_hash->entries_list = NULL;

6
gtk/gtklabel.c
View File

@ -4526,11 +4526,11 @@ gtk_label_do_popup (GtkLabel *label,
label->select_info->selection_anchor != label->select_info->selection_end; label->select_info->selection_anchor != label->select_info->selection_end;
append_action_signal (label, label->select_info->popup_menu, GTK_STOCK_CUT, "cut_clipboard", append_action_signal (label, label->select_info->popup_menu, GTK_STOCK_CUT, "cut-clipboard",
FALSE); FALSE);
append_action_signal (label, label->select_info->popup_menu, GTK_STOCK_COPY, "copy_clipboard", append_action_signal (label, label->select_info->popup_menu, GTK_STOCK_COPY, "copy-clipboard",
have_selection); have_selection);
append_action_signal (label, label->select_info->popup_menu, GTK_STOCK_PASTE, "paste_clipboard", append_action_signal (label, label->select_info->popup_menu, GTK_STOCK_PASTE, "paste-clipboard",
FALSE); FALSE);
menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_DELETE, NULL); menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_DELETE, NULL);

2
gtk/gtkmenu.c
View File

@ -989,7 +989,7 @@ gtk_menu_init (GtkMenu *menu)
"child", menu, "child", menu,
NULL), NULL),
"signal::event", gtk_menu_window_event, menu, "signal::event", gtk_menu_window_event, menu,
"signal::size_request", gtk_menu_window_size_request, menu, "signal::size-request", gtk_menu_window_size_request, menu,
"signal::destroy", gtk_widget_destroyed, &menu->toplevel, "signal::destroy", gtk_widget_destroyed, &menu->toplevel,
NULL); NULL);
gtk_window_set_resizable (GTK_WINDOW (menu->toplevel), FALSE); gtk_window_set_resizable (GTK_WINDOW (menu->toplevel), FALSE);

18
gtk/gtkmenubar.c
View File

@ -115,42 +115,42 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
binding_set = gtk_binding_set_by_class (class); binding_set = gtk_binding_set_by_class (class);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_Left, 0, GDK_Left, 0,
"move_current", 1, "move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE, GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_PREV); GTK_MENU_DIR_PREV);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_KP_Left, 0, GDK_KP_Left, 0,
"move_current", 1, "move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE, GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_PREV); GTK_MENU_DIR_PREV);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_Right, 0, GDK_Right, 0,
"move_current", 1, "move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE, GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_NEXT); GTK_MENU_DIR_NEXT);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_KP_Right, 0, GDK_KP_Right, 0,
"move_current", 1, "move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE, GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_NEXT); GTK_MENU_DIR_NEXT);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_Up, 0, GDK_Up, 0,
"move_current", 1, "move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE, GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_PARENT); GTK_MENU_DIR_PARENT);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_KP_Up, 0, GDK_KP_Up, 0,
"move_current", 1, "move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE, GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_PARENT); GTK_MENU_DIR_PARENT);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_Down, 0, GDK_Down, 0,
"move_current", 1, "move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE, GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_CHILD); GTK_MENU_DIR_CHILD);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_KP_Down, 0, GDK_KP_Down, 0,
"move_current", 1, "move-current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE, GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_CHILD); GTK_MENU_DIR_CHILD);
@ -649,7 +649,7 @@ add_to_window (GtkWindow *window,
if (!menubars) if (!menubars)
{ {
g_signal_connect (window, g_signal_connect (window,
"key_press_event", "key-press-event",
G_CALLBACK (window_key_press_handler), G_CALLBACK (window_key_press_handler),
NULL); NULL);
} }

6
gtk/gtkpaned.c
View File

@ -148,9 +148,9 @@ add_tab_bindings (GtkBindingSet *binding_set,
GdkModifierType modifiers) GdkModifierType modifiers)
{ {
gtk_binding_entry_add_signal (binding_set, GDK_Tab, modifiers, gtk_binding_entry_add_signal (binding_set, GDK_Tab, modifiers,
"toggle_handle_focus", 0); "toggle-handle-focus", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, modifiers, gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, modifiers,
"toggle_handle_focus", 0); "toggle-handle-focus", 0);
} }
static void static void
@ -160,7 +160,7 @@ add_move_binding (GtkBindingSet *binding_set,
GtkScrollType scroll) GtkScrollType scroll)
{ {
gtk_binding_entry_add_signal (binding_set, keyval, mask, gtk_binding_entry_add_signal (binding_set, keyval, mask,
"move_handle", 1, "move-handle", 1,
GTK_TYPE_SCROLL_TYPE, scroll); GTK_TYPE_SCROLL_TYPE, scroll);
} }

2
gtk/gtkrecentchooserdialog.c
View File

@ -163,7 +163,7 @@ gtk_recent_chooser_dialog_constructor (GType type,
else else
priv->chooser = g_object_new (GTK_TYPE_RECENT_CHOOSER_WIDGET, NULL); priv->chooser = g_object_new (GTK_TYPE_RECENT_CHOOSER_WIDGET, NULL);
g_signal_connect (priv->chooser, "item_activated", g_signal_connect (priv->chooser, "item-activated",
G_CALLBACK (gtk_recent_chooser_item_activated_cb), G_CALLBACK (gtk_recent_chooser_item_activated_cb),
object); object);

2
gtk/gtkrecentchooserutils.c
View File

@ -161,7 +161,7 @@ _gtk_recent_chooser_set_delegate (GtkRecentChooser *receiver,
G_CALLBACK (delegate_notify), receiver); G_CALLBACK (delegate_notify), receiver);
g_signal_connect (delegate, "selection-changed", g_signal_connect (delegate, "selection-changed",
G_CALLBACK (delegate_selection_changed), receiver); G_CALLBACK (delegate_selection_changed), receiver);
g_signal_connect (delegate, "item_activated", g_signal_connect (delegate, "item-activated",
G_CALLBACK (delegate_item_activated), receiver); G_CALLBACK (delegate_item_activated), receiver);
} }

12
gtk/gtkselection.c
View File

@ -1008,7 +1008,7 @@ gtk_selection_remove_all (GtkWidget *widget)
In emergency, you could use #GDK_CURRENT_TIME In emergency, you could use #GDK_CURRENT_TIME
* *
* Requests the contents of a selection. When received, * Requests the contents of a selection. When received,
* a "selection_received" signal will be generated. * a "selection-received" signal will be generated.
* *
* Return value: %TRUE if requested succeeded. %FALSE if we could not process * Return value: %TRUE if requested succeeded. %FALSE if we could not process
* request. (e.g., there was already a request in process for * request. (e.g., there was already a request in process for
@ -2635,7 +2635,7 @@ gtk_selection_incr_timeout (GtkIncrInfo *info)
/************************************************************* /*************************************************************
* _gtk_selection_notify: * _gtk_selection_notify:
* Handler for "selection_notify_event" signals on windows * Handler for "selection-notify-event" signals on windows
* where a retrieval is currently in process. The selection * where a retrieval is currently in process. The selection
* owner has responded to our conversion request. * owner has responded to our conversion request.
* arguments: * arguments:
@ -2724,7 +2724,7 @@ _gtk_selection_notify (GtkWidget *widget,
/************************************************************* /*************************************************************
* _gtk_selection_property_notify: * _gtk_selection_property_notify:
* Handler for "property_notify_event" signals on windows * Handler for "property-notify-event" signals on windows
* where a retrieval is currently in process. The selection * where a retrieval is currently in process. The selection
* owner has added more data. * owner has added more data.
* arguments: * arguments:
@ -2879,7 +2879,7 @@ gtk_selection_retrieval_timeout (GtkRetrievalInfo *info)
/************************************************************* /*************************************************************
* gtk_selection_retrieval_report: * gtk_selection_retrieval_report:
* Emits a "selection_received" signal. * Emits a "selection-received" signal.
* arguments: * arguments:
* info: information about the retrieval that completed * info: information about the retrieval that completed
* buffer: buffer containing data (NULL => errror) * buffer: buffer containing data (NULL => errror)
@ -2905,7 +2905,7 @@ gtk_selection_retrieval_report (GtkRetrievalInfo *info,
data.display = gtk_widget_get_display (info->widget); data.display = gtk_widget_get_display (info->widget);
g_signal_emit_by_name (info->widget, g_signal_emit_by_name (info->widget,
"selection_received", "selection-received",
&data, time); &data, time);
} }
@ -2940,7 +2940,7 @@ gtk_selection_invoke_handler (GtkWidget *widget,
gtk_target_list_find (target_list, data->target, &info)) gtk_target_list_find (target_list, data->target, &info))
{ {
g_signal_emit_by_name (widget, g_signal_emit_by_name (widget,
"selection_get", "selection-get",
data, data,
info, time); info, time);
} }

2
gtk/gtksizegroup.c
View File

@ -618,7 +618,7 @@ do_size_request (GtkWidget *widget)
gtk_widget_ensure_style (widget); gtk_widget_ensure_style (widget);
GTK_PRIVATE_UNSET_FLAG (widget, GTK_REQUEST_NEEDED); GTK_PRIVATE_UNSET_FLAG (widget, GTK_REQUEST_NEEDED);
g_signal_emit_by_name (widget, g_signal_emit_by_name (widget,
"size_request", "size-request",
&widget->requisition); &widget->requisition);
} }
} }

2
gtk/gtktextbtree.c
View File

@ -430,7 +430,7 @@ _gtk_text_btree_new (GtkTextTagTable *table,
g_object_ref (tree->table); g_object_ref (tree->table);
tree->tag_changed_handler = g_signal_connect (tree->table, tree->tag_changed_handler = g_signal_connect (tree->table,
"tag_changed", "tag-changed",
G_CALLBACK (tag_changed_cb), G_CALLBACK (tag_changed_cb),
tree); tree);

53
gtk/gtktextbuffer.c
View File

@ -270,7 +270,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* @text: the UTF-8 text to be inserted * @text: the UTF-8 text to be inserted
* @len: length of the inserted text in bytes * @len: length of the inserted text in bytes
* *
* The insert_text signal is emitted to insert text in a #GtkTextBuffer. * The ::insert-text signal is emitted to insert text in a #GtkTextBuffer.
* Insertion actually occurs in the default handler. * Insertion actually occurs in the default handler.
* *
* Note that if your handler runs before the default handler it must not * Note that if your handler runs before the default handler it must not
@ -301,7 +301,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* @location: position to insert @pixbuf in @textbuffer * @location: position to insert @pixbuf in @textbuffer
* @pixbuf: the #GdkPixbuf to be inserted * @pixbuf: the #GdkPixbuf to be inserted
* *
* The insert_pixbuf signal is emitted to insert a #GdkPixbuf * The ::insert-pixbuf signal is emitted to insert a #GdkPixbuf
* in a #GtkTextBuffer. Insertion actually occurs in the default handler. * in a #GtkTextBuffer. Insertion actually occurs in the default handler.
* *
* Note that if your handler runs before the default handler it must not * Note that if your handler runs before the default handler it must not
@ -330,7 +330,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* @location: position to insert @anchor in @textbuffer * @location: position to insert @anchor in @textbuffer
* @anchor: the #GtkTextChildAnchor to be inserted * @anchor: the #GtkTextChildAnchor to be inserted
* *
* The insert_child_anchor signal is emitted to insert a * The ::insert-child-anchor signal is emitted to insert a
* #GtkTextChildAnchor in a #GtkTextBuffer. * #GtkTextChildAnchor in a #GtkTextBuffer.
* Insertion actually occurs in the default handler. * Insertion actually occurs in the default handler.
* *
@ -359,7 +359,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* @start: the start of the range to be deleted * @start: the start of the range to be deleted
* @end: the end of the range to be deleted * @end: the end of the range to be deleted
* *
* The delete_range signal is emitted to delete a range * The ::delete-range signal is emitted to delete a range
* from a #GtkTextBuffer. * from a #GtkTextBuffer.
* *
* Note that if your handler runs before the default handler it must not * Note that if your handler runs before the default handler it must not
@ -387,7 +387,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* GtkTextBuffer::changed: * GtkTextBuffer::changed:
* @textbuffer: the object which received the signal * @textbuffer: the object which received the signal
* *
* The changed signal is emitted when the content of a #GtkTextBuffer * The ::changed signal is emitted when the content of a #GtkTextBuffer
* has changed. * has changed.
*/ */
signals[CHANGED] = signals[CHANGED] =
@ -404,7 +404,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* GtkTextBuffer::modified-changed: * GtkTextBuffer::modified-changed:
* @textbuffer: the object which received the signal * @textbuffer: the object which received the signal
* *
* The modified_changed signal is emitted when the modified bit of a * The ::modified-changed signal is emitted when the modified bit of a
* #GtkTextBuffer flips. * #GtkTextBuffer flips.
* *
* See also: * See also:
@ -426,7 +426,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* @location: The location of @mark in @textbuffer * @location: The location of @mark in @textbuffer
* @mark: The mark that is set * @mark: The mark that is set
* *
* The mark_set signal is emitted as notification * The ::mark-set signal is emitted as notification
* after a #GtkTextMark is set. * after a #GtkTextMark is set.
* *
* See also: * See also:
@ -450,7 +450,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* @textbuffer: the object which received the signal * @textbuffer: the object which received the signal
* @mark: The mark that was deleted * @mark: The mark that was deleted
* *
* The mark_deleted signal is emitted as notification * The ::mark-deleted signal is emitted as notification
* after a #GtkTextMark is deleted. * after a #GtkTextMark is deleted.
* *
* See also: * See also:
@ -474,7 +474,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* @start: the start of the range the tag is applied to * @start: the start of the range the tag is applied to
* @end: the end of the range the tag is applied to * @end: the end of the range the tag is applied to
* *
* The apply_tag signal is emitted to apply a tag to a * The ::apply-tag signal is emitted to apply a tag to a
* range of text in a #GtkTextBuffer. * range of text in a #GtkTextBuffer.
* Applying actually occurs in the default handler. * Applying actually occurs in the default handler.
* *
@ -507,8 +507,8 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* @start: the start of the range the tag is removed from * @start: the start of the range the tag is removed from
* @end: the end of the range the tag is removed from * @end: the end of the range the tag is removed from
* *
* The remove_tag signal is emitted to remove all occurrences of @tag from a * The ::remove-tag signal is emitted to remove all occurrences of @tag from
* range of text in a #GtkTextBuffer. * a range of text in a #GtkTextBuffer.
* Removal actually occurs in the default handler. * Removal actually occurs in the default handler.
* *
* Note that if your handler runs before the default handler it must not * Note that if your handler runs before the default handler it must not
@ -534,7 +534,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* GtkTextBuffer::begin-user-action: * GtkTextBuffer::begin-user-action:
* @textbuffer: the object which received the signal * @textbuffer: the object which received the signal
* *
* The begin_user_action signal is emitted at the beginning of a single * The ::begin-user-action signal is emitted at the beginning of a single
* user-visible operation on a #GtkTextBuffer. * user-visible operation on a #GtkTextBuffer.
* *
* See also: * See also:
@ -559,7 +559,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
* GtkTextBuffer::end-user-action: * GtkTextBuffer::end-user-action:
* @textbuffer: the object which received the signal * @textbuffer: the object which received the signal
* *
* The end_user_action signal is emitted at the end of a single * The ::end-user-action signal is emitted at the end of a single
* user-visible operation #GtkTextBuffer. * user-visible operation #GtkTextBuffer.
* *
* See also: * See also:
@ -880,7 +880,7 @@ gtk_text_buffer_emit_insert (GtkTextBuffer *buffer,
* *
* Inserts @len bytes of @text at position @iter. If @len is -1, * Inserts @len bytes of @text at position @iter. If @len is -1,
* @text must be nul-terminated and will be inserted in its * @text must be nul-terminated and will be inserted in its
* entirety. Emits the "insert_text" signal; insertion actually occurs * entirety. Emits the "insert-text" signal; insertion actually occurs
* in the default handler for the signal. @iter is invalidated when * in the default handler for the signal. @iter is invalidated when
* insertion occurs (because the buffer contents change), but the * insertion occurs (because the buffer contents change), but the
* default signal handler revalidates it to point to the end of the * default signal handler revalidates it to point to the end of the
@ -1601,7 +1601,7 @@ gtk_text_buffer_emit_delete (GtkTextBuffer *buffer,
* *
* Deletes text between @start and @end. The order of @start and @end * Deletes text between @start and @end. The order of @start and @end
* is not actually relevant; gtk_text_buffer_delete() will reorder * is not actually relevant; gtk_text_buffer_delete() will reorder
* them. This function actually emits the "delete_range" signal, and * them. This function actually emits the "delete-range" signal, and
* the default handler of that signal deletes the text. Because the * the default handler of that signal deletes the text. Because the
* buffer is modified, all outstanding iterators become invalid after * buffer is modified, all outstanding iterators become invalid after
* calling this function; however, the @start and @end will be * calling this function; however, the @start and @end will be
@ -1725,8 +1725,9 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
/* It's more robust to ask for the state again then to assume that /* It's more robust to ask for the state again then to assume that
* we're on the next not-editable segment. We don't know what the * we're on the next not-editable segment. We don't know what the
* ::delete-range handler did.... maybe it deleted the following not-editable * ::delete-range handler did.... maybe it deleted the following
* segment because it was associated with the editable segment. * not-editable segment because it was associated with the editable
* segment.
*/ */
current_state = gtk_text_iter_editable (&iter, default_editable); current_state = gtk_text_iter_editable (&iter, default_editable);
deleted_stuff = TRUE; deleted_stuff = TRUE;
@ -2056,7 +2057,7 @@ gtk_text_buffer_set_mark (GtkTextBuffer *buffer,
* return value if you like. Marks are owned by the buffer and go * return value if you like. Marks are owned by the buffer and go
* away when the buffer does. * away when the buffer does.
* *
* Emits the "mark_set" signal as notification of the mark's initial * Emits the "mark-set" signal as notification of the mark's initial
* placement. * placement.
* *
* Return value: the new #GtkTextMark object * Return value: the new #GtkTextMark object
@ -2083,7 +2084,7 @@ gtk_text_buffer_create_mark (GtkTextBuffer *buffer,
* another buffer, and if its name is not %NULL then there must not * another buffer, and if its name is not %NULL then there must not
* be another mark in the buffer with the same name. * be another mark in the buffer with the same name.
* *
* Emits the "mark_set" signal as notification of the mark's initial * Emits the "mark-set" signal as notification of the mark's initial
* placement. * placement.
* *
* Since: 2.12 * Since: 2.12
@ -2117,7 +2118,7 @@ gtk_text_buffer_add_mark (GtkTextBuffer *buffer,
* @mark: a #GtkTextMark * @mark: a #GtkTextMark
* @where: new location for @mark in @buffer * @where: new location for @mark in @buffer
* *
* Moves @mark to the new location @where. Emits the "mark_set" signal * Moves @mark to the new location @where. Emits the "mark-set" signal
* as notification of the move. * as notification of the move.
**/ **/
void void
@ -2166,7 +2167,7 @@ gtk_text_buffer_get_iter_at_mark (GtkTextBuffer *buffer,
* invalid, until it gets added to a buffer again with * invalid, until it gets added to a buffer again with
* gtk_text_buffer_add_mark(). Use gtk_text_mark_get_deleted() to * gtk_text_buffer_add_mark(). Use gtk_text_mark_get_deleted() to
* find out if a mark has been removed from its buffer. * find out if a mark has been removed from its buffer.
* The "mark_deleted" signal will be emitted as notification after * The "mark-deleted" signal will be emitted as notification after
* the mark is deleted. * the mark is deleted.
**/ **/
void void
@ -2549,7 +2550,7 @@ gtk_text_buffer_emit_tag (GtkTextBuffer *buffer,
* @start: one bound of range to be tagged * @start: one bound of range to be tagged
* @end: other bound of range to be tagged * @end: other bound of range to be tagged
* *
* Emits the "apply_tag" signal on @buffer. The default * Emits the "apply-tag" signal on @buffer. The default
* handler for the signal applies @tag to the given range. * handler for the signal applies @tag to the given range.
* @start and @end do not have to be in order. * @start and @end do not have to be in order.
**/ **/
@ -2577,7 +2578,7 @@ gtk_text_buffer_apply_tag (GtkTextBuffer *buffer,
* @start: one bound of range to be untagged * @start: one bound of range to be untagged
* @end: other bound of range to be untagged * @end: other bound of range to be untagged
* *
* Emits the "remove_tag" signal. The default handler for the signal * Emits the "remove-tag" signal. The default handler for the signal
* removes all occurrences of @tag from the given range. @start and * removes all occurrences of @tag from the given range. @start and
* @end don't have to be in order. * @end don't have to be in order.
**/ **/
@ -2988,7 +2989,7 @@ gtk_text_buffer_get_modified (GtkTextBuffer *buffer)
* last time it was saved. Whenever the buffer is saved to disk, call * last time it was saved. Whenever the buffer is saved to disk, call
* gtk_text_buffer_set_modified (@buffer, FALSE). When the buffer is modified, * gtk_text_buffer_set_modified (@buffer, FALSE). When the buffer is modified,
* it will automatically toggled on the modified bit again. When the modified * it will automatically toggled on the modified bit again. When the modified
* bit flips, the buffer emits a "modified_changed" signal. * bit flips, the buffer emits a "modified-changed" signal.
**/ **/
void void
gtk_text_buffer_set_modified (GtkTextBuffer *buffer, gtk_text_buffer_set_modified (GtkTextBuffer *buffer,
@ -4023,7 +4024,7 @@ gtk_text_buffer_get_selection_bounds (GtkTextBuffer *buffer,
* an undo stack. #GtkTextBuffer maintains a count of calls to * an undo stack. #GtkTextBuffer maintains a count of calls to
* gtk_text_buffer_begin_user_action() that have not been closed with * gtk_text_buffer_begin_user_action() that have not been closed with
* a call to gtk_text_buffer_end_user_action(), and emits the * a call to gtk_text_buffer_end_user_action(), and emits the
* "begin_user_action" and "end_user_action" signals only for the * "begin-user-action" and "end-user-action" signals only for the
* outermost pair of calls. This allows you to build user actions * outermost pair of calls. This allows you to build user actions
* from other user actions. * from other user actions.
* *
@ -4349,7 +4350,7 @@ _gtk_text_buffer_notify_will_remove_tag (GtkTextBuffer *buffer,
GtkTextTag *tag) GtkTextTag *tag)
{ {
/* This removes tag from the buffer, but DOESN'T emit the /* This removes tag from the buffer, but DOESN'T emit the
* remove_tag signal, because we can't afford to have user * remove-tag signal, because we can't afford to have user
* code messing things up at this point; the tag MUST be removed * code messing things up at this point; the tag MUST be removed
* entirely. * entirely.
*/ */

6
gtk/gtktextview.c
View File

@ -7609,13 +7609,13 @@ popup_targets_received (GtkClipboard *clipboard,
can_insert = gtk_text_iter_can_insert (&iter, text_view->editable); can_insert = gtk_text_iter_can_insert (&iter, text_view->editable);
append_action_signal (text_view, text_view->popup_menu, GTK_STOCK_CUT, "cut_clipboard", append_action_signal (text_view, text_view->popup_menu, GTK_STOCK_CUT, "cut-clipboard",
have_selection && have_selection &&
range_contains_editable_text (&sel_start, &sel_end, range_contains_editable_text (&sel_start, &sel_end,
text_view->editable)); text_view->editable));
append_action_signal (text_view, text_view->popup_menu, GTK_STOCK_COPY, "copy_clipboard", append_action_signal (text_view, text_view->popup_menu, GTK_STOCK_COPY, "copy-clipboard",
have_selection); have_selection);
append_action_signal (text_view, text_view->popup_menu, GTK_STOCK_PASTE, "paste_clipboard", append_action_signal (text_view, text_view->popup_menu, GTK_STOCK_PASTE, "paste-clipboard",
can_insert && clipboard_contains_text); can_insert && clipboard_contains_text);
menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_DELETE, NULL); menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_DELETE, NULL);

8
gtk/gtktoolbar.c
View File

@ -323,10 +323,10 @@ add_arrow_bindings (GtkBindingSet *binding_set,
guint keypad_keysym = keysym - GDK_Left + GDK_KP_Left; guint keypad_keysym = keysym - GDK_Left + GDK_KP_Left;
gtk_binding_entry_add_signal (binding_set, keysym, 0, gtk_binding_entry_add_signal (binding_set, keysym, 0,
"move_focus", 1, "move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, dir); GTK_TYPE_DIRECTION_TYPE, dir);
gtk_binding_entry_add_signal (binding_set, keypad_keysym, 0, gtk_binding_entry_add_signal (binding_set, keypad_keysym, 0,
"move_focus", 1, "move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, dir); GTK_TYPE_DIRECTION_TYPE, dir);
} }
@ -337,11 +337,11 @@ add_ctrl_tab_bindings (GtkBindingSet *binding_set,
{ {
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_Tab, GDK_CONTROL_MASK | modifiers, GDK_Tab, GDK_CONTROL_MASK | modifiers,
"move_focus", 1, "move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction); GTK_TYPE_DIRECTION_TYPE, direction);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_KP_Tab, GDK_CONTROL_MASK | modifiers, GDK_KP_Tab, GDK_CONTROL_MASK | modifiers,
"move_focus", 1, "move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction); GTK_TYPE_DIRECTION_TYPE, direction);
} }

10
gtk/gtktreemodel.c
View File

@ -1463,7 +1463,7 @@ gtk_tree_model_get_valist (GtkTreeModel *tree_model,
* @path: A #GtkTreePath pointing to the changed row * @path: A #GtkTreePath pointing to the changed row
* @iter: A valid #GtkTreeIter pointing to the changed row * @iter: A valid #GtkTreeIter pointing to the changed row
* *
* Emits the "row_changed" signal on @tree_model. * Emits the "row-changed" signal on @tree_model.
**/ **/
void void
gtk_tree_model_row_changed (GtkTreeModel *tree_model, gtk_tree_model_row_changed (GtkTreeModel *tree_model,
@ -1483,7 +1483,7 @@ gtk_tree_model_row_changed (GtkTreeModel *tree_model,
* @path: A #GtkTreePath pointing to the inserted row * @path: A #GtkTreePath pointing to the inserted row
* @iter: A valid #GtkTreeIter pointing to the inserted row * @iter: A valid #GtkTreeIter pointing to the inserted row
* *
* Emits the "row_inserted" signal on @tree_model * Emits the "row-inserted" signal on @tree_model
**/ **/
void void
gtk_tree_model_row_inserted (GtkTreeModel *tree_model, gtk_tree_model_row_inserted (GtkTreeModel *tree_model,
@ -1503,7 +1503,7 @@ gtk_tree_model_row_inserted (GtkTreeModel *tree_model,
* @path: A #GtkTreePath pointing to the changed row * @path: A #GtkTreePath pointing to the changed row
* @iter: A valid #GtkTreeIter pointing to the changed row * @iter: A valid #GtkTreeIter pointing to the changed row
* *
* Emits the "row_has_child_toggled" signal on @tree_model. This should be * Emits the "row-has-child-toggled" signal on @tree_model. This should be
* called by models after the child state of a node changes. * called by models after the child state of a node changes.
**/ **/
void void
@ -1523,7 +1523,7 @@ gtk_tree_model_row_has_child_toggled (GtkTreeModel *tree_model,
* @tree_model: A #GtkTreeModel * @tree_model: A #GtkTreeModel
* @path: A #GtkTreePath pointing to the previous location of the deleted row. * @path: A #GtkTreePath pointing to the previous location of the deleted row.
* *
* Emits the "row_deleted" signal on @tree_model. This should be called by * Emits the "row-deleted" signal on @tree_model. This should be called by
* models after a row has been removed. The location pointed to by @path * models after a row has been removed. The location pointed to by @path
* should be the location that the row previously was at. It may not be a * should be the location that the row previously was at. It may not be a
* valid location anymore. * valid location anymore.
@ -1549,7 +1549,7 @@ gtk_tree_model_row_deleted (GtkTreeModel *tree_model,
* to its old position before the re-ordering, * to its old position before the re-ordering,
* i.e. @new_order<literal>[newpos] = oldpos</literal>. * i.e. @new_order<literal>[newpos] = oldpos</literal>.
* *
* Emits the "rows_reordered" signal on @tree_model. This should be called by * Emits the "rows-reordered" signal on @tree_model. This should be called by
* models when their rows have been reordered. * models when their rows have been reordered.
**/ **/
void void

16
gtk/gtkuimanager.c
View File

@ -726,10 +726,10 @@ gtk_ui_manager_insert_action_group (GtkUIManager *self,
self->private_data->action_groups = self->private_data->action_groups =
g_list_insert (self->private_data->action_groups, action_group, pos); g_list_insert (self->private_data->action_groups, action_group, pos);
g_object_connect (action_group, g_object_connect (action_group,
"object_signal::connect_proxy", G_CALLBACK (cb_proxy_connect_proxy), self, "object-signal::connect-proxy", G_CALLBACK (cb_proxy_connect_proxy), self,
"object_signal::disconnect_proxy", G_CALLBACK (cb_proxy_disconnect_proxy), self, "object-signal::disconnect-proxy", G_CALLBACK (cb_proxy_disconnect_proxy), self,
"object_signal::pre_activate", G_CALLBACK (cb_proxy_pre_activate), self, "object-signal::pre-activate", G_CALLBACK (cb_proxy_pre_activate), self,
"object_signal::post_activate", G_CALLBACK (cb_proxy_post_activate), self, "object-signal::post-activate", G_CALLBACK (cb_proxy_post_activate), self,
NULL); NULL);
/* dirty all nodes, as action bindings may change */ /* dirty all nodes, as action bindings may change */
@ -761,10 +761,10 @@ gtk_ui_manager_remove_action_group (GtkUIManager *self,
g_list_remove (self->private_data->action_groups, action_group); g_list_remove (self->private_data->action_groups, action_group);
g_object_disconnect (action_group, g_object_disconnect (action_group,
"any_signal::connect_proxy", G_CALLBACK (cb_proxy_connect_proxy), self, "any-signal::connect-proxy", G_CALLBACK (cb_proxy_connect_proxy), self,
"any_signal::disconnect_proxy", G_CALLBACK (cb_proxy_disconnect_proxy), self, "any-signal::disconnect-proxy", G_CALLBACK (cb_proxy_disconnect_proxy), self,
"any_signal::pre_activate", G_CALLBACK (cb_proxy_pre_activate), self, "any-signal::pre-activate", G_CALLBACK (cb_proxy_pre_activate), self,
"any_signal::post_activate", G_CALLBACK (cb_proxy_post_activate), self, "any-signal::post-activate", G_CALLBACK (cb_proxy_post_activate), self,
NULL); NULL);
g_object_unref (action_group); g_object_unref (action_group);

6
gtk/gtkwindow-decorate.c
View File

@ -150,15 +150,15 @@ gtk_decorated_window_init (GtkWindow *window)
gtk_window_set_has_frame (window, TRUE); gtk_window_set_has_frame (window, TRUE);
g_signal_connect (window, g_signal_connect (window,
"frame_event", "frame-event",
G_CALLBACK (gtk_decorated_window_frame_event), G_CALLBACK (gtk_decorated_window_frame_event),
window); window);
g_signal_connect (window, g_signal_connect (window,
"focus_in_event", "focus-in-event",
G_CALLBACK (gtk_decorated_window_focus_change), G_CALLBACK (gtk_decorated_window_focus_change),
window); window);
g_signal_connect (window, g_signal_connect (window,
"focus_out_event", "focus-out-event",
G_CALLBACK (gtk_decorated_window_focus_change), G_CALLBACK (gtk_decorated_window_focus_change),
window); window);
g_signal_connect (window, g_signal_connect (window,

34
gtk/gtkwindow.c
View File

@ -342,10 +342,10 @@ add_tab_bindings (GtkBindingSet *binding_set,
GtkDirectionType direction) GtkDirectionType direction)
{ {
gtk_binding_entry_add_signal (binding_set, GDK_Tab, modifiers, gtk_binding_entry_add_signal (binding_set, GDK_Tab, modifiers,
"move_focus", 1, "move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction); GTK_TYPE_DIRECTION_TYPE, direction);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, modifiers, gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, modifiers,
"move_focus", 1, "move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction); GTK_TYPE_DIRECTION_TYPE, direction);
} }
@ -357,16 +357,16 @@ add_arrow_bindings (GtkBindingSet *binding_set,
guint keypad_keysym = keysym - GDK_Left + GDK_KP_Left; guint keypad_keysym = keysym - GDK_Left + GDK_KP_Left;
gtk_binding_entry_add_signal (binding_set, keysym, 0, gtk_binding_entry_add_signal (binding_set, keysym, 0,
"move_focus", 1, "move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction); GTK_TYPE_DIRECTION_TYPE, direction);
gtk_binding_entry_add_signal (binding_set, keysym, GDK_CONTROL_MASK, gtk_binding_entry_add_signal (binding_set, keysym, GDK_CONTROL_MASK,
"move_focus", 1, "move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction); GTK_TYPE_DIRECTION_TYPE, direction);
gtk_binding_entry_add_signal (binding_set, keypad_keysym, 0, gtk_binding_entry_add_signal (binding_set, keypad_keysym, 0,
"move_focus", 1, "move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction); GTK_TYPE_DIRECTION_TYPE, direction);
gtk_binding_entry_add_signal (binding_set, keypad_keysym, GDK_CONTROL_MASK, gtk_binding_entry_add_signal (binding_set, keypad_keysym, GDK_CONTROL_MASK,
"move_focus", 1, "move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction); GTK_TYPE_DIRECTION_TYPE, direction);
} }
@ -3842,7 +3842,7 @@ gtk_window_resize (GtkWindow *window,
* because the size of the window may change between the time that you * because the size of the window may change between the time that you
* get the size and the time that you perform some action assuming * get the size and the time that you perform some action assuming
* that size is the current size. To avoid race conditions, connect to * that size is the current size. To avoid race conditions, connect to
* "configure_event" on the window and adjust your size-dependent * "configure-event" on the window and adjust your size-dependent
* state to match the size delivered in the #GdkEventConfigure. * state to match the size delivered in the #GdkEventConfigure.
* *
* Note 2: The returned size does <emphasis>not</emphasis> include the * Note 2: The returned size does <emphasis>not</emphasis> include the
@ -6599,7 +6599,7 @@ gtk_window_present_with_time (GtkWindow *window,
* in which case the window will be iconified before it ever appears * in which case the window will be iconified before it ever appears
* onscreen. * onscreen.
* *
* You can track iconification via the "window_state_event" signal * You can track iconification via the "window-state-event" signal
* on #GtkWidget. * on #GtkWidget.
* *
**/ **/
@ -6634,7 +6634,7 @@ gtk_window_iconify (GtkWindow *window)
* linkend="gtk-X11-arch">window manager</link>) could iconify it * linkend="gtk-X11-arch">window manager</link>) could iconify it
* again before your code which assumes deiconification gets to run. * again before your code which assumes deiconification gets to run.
* *
* You can track iconification via the "window_state_event" signal * You can track iconification via the "window-state-event" signal
* on #GtkWidget. * on #GtkWidget.
**/ **/
void void
@ -6672,7 +6672,7 @@ gtk_window_deiconify (GtkWindow *window)
* *
* It's permitted to call this function before showing a window. * It's permitted to call this function before showing a window.
* *
* You can track stickiness via the "window_state_event" signal * You can track stickiness via the "window-state-event" signal
* on #GtkWidget. * on #GtkWidget.
* *
**/ **/
@ -6708,7 +6708,7 @@ gtk_window_stick (GtkWindow *window)
* manager</link>) could stick it again. But normally the window will * manager</link>) could stick it again. But normally the window will
* end up stuck. Just don't write code that crashes if not. * end up stuck. Just don't write code that crashes if not.
* *
* You can track stickiness via the "window_state_event" signal * You can track stickiness via the "window-state-event" signal
* on #GtkWidget. * on #GtkWidget.
* *
**/ **/
@ -6749,7 +6749,7 @@ gtk_window_unstick (GtkWindow *window)
* in which case the window will be maximized when it appears onscreen * in which case the window will be maximized when it appears onscreen
* initially. * initially.
* *
* You can track maximization via the "window_state_event" signal * You can track maximization via the "window-state-event" signal
* on #GtkWidget. * on #GtkWidget.
* *
**/ **/
@ -6785,7 +6785,7 @@ gtk_window_maximize (GtkWindow *window)
* managers honor requests to unmaximize. But normally the window will * managers honor requests to unmaximize. But normally the window will
* end up unmaximized. Just don't write code that crashes if not. * end up unmaximized. Just don't write code that crashes if not.
* *
* You can track maximization via the "window_state_event" signal * You can track maximization via the "window-state-event" signal
* on #GtkWidget. * on #GtkWidget.
* *
**/ **/
@ -6822,7 +6822,7 @@ gtk_window_unmaximize (GtkWindow *window)
* windows. But normally the window will end up fullscreen. Just * windows. But normally the window will end up fullscreen. Just
* don't write code that crashes if not. * don't write code that crashes if not.
* *
* You can track the fullscreen state via the "window_state_event" signal * You can track the fullscreen state via the "window-state-event" signal
* on #GtkWidget. * on #GtkWidget.
* *
* Since: 2.2 * Since: 2.2
@ -6862,7 +6862,7 @@ gtk_window_fullscreen (GtkWindow *window)
* windows. But normally the window will end up restored to its normal * windows. But normally the window will end up restored to its normal
* state. Just don't write code that crashes if not. * state. Just don't write code that crashes if not.
* *
* You can track the fullscreen state via the "window_state_event" signal * You can track the fullscreen state via the "window-state-event" signal
* on #GtkWidget. * on #GtkWidget.
* *
* Since: 2.2 * Since: 2.2
@ -6907,7 +6907,7 @@ gtk_window_unfullscreen (GtkWindow *window)
* in which case the window will be kept above when it appears onscreen * in which case the window will be kept above when it appears onscreen
* initially. * initially.
* *
* You can track the above state via the "window_state_event" signal * You can track the above state via the "window-state-event" signal
* on #GtkWidget. * on #GtkWidget.
* *
* Note that, according to the <ulink * Note that, according to the <ulink
@ -6961,7 +6961,7 @@ gtk_window_set_keep_above (GtkWindow *window,
* in which case the window will be kept below when it appears onscreen * in which case the window will be kept below when it appears onscreen
* initially. * initially.
* *
* You can track the below state via the "window_state_event" signal * You can track the below state via the "window-state-event" signal
* on #GtkWidget. * on #GtkWidget.
* *
* Note that, according to the <ulink * Note that, according to the <ulink