Commit 7f006959 authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

remove _gtk_binding_signal_new().

2008-07-21  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkbindings.[ch]: remove _gtk_binding_signal_new().

	* gtk/gtkfilechooserdefault.c
	* gtk/gtkmenu.c
	* gtk/gtkmenushell.c
	* gtk/gtkscalebutton.c
	* gtk/gtktextview.c
	* gtk/gtktoolbar.c
	* gtk/gtkwidget.c: use g_signal_new_class_handler() instead. Add
	some missing I_() to the signal names.


svn path=/trunk/; revision=20874
parent c6bb5b48
2008-07-21 Michael Natterer <mitch@imendio.com>
* gtk/gtkbindings.[ch]: remove _gtk_binding_signal_new().
* gtk/gtkfilechooserdefault.c
* gtk/gtkmenu.c
* gtk/gtkmenushell.c
* gtk/gtkscalebutton.c
* gtk/gtktextview.c
* gtk/gtktoolbar.c
* gtk/gtkwidget.c: use g_signal_new_class_handler() instead. Add
some missing I_() to the signal names.
2008-07-21 Michael Natterer <mitch@imendio.com> 2008-07-21 Michael Natterer <mitch@imendio.com>
* gtk/gtkspinbutton.c: remove g_return_if_fail() from private * gtk/gtkspinbutton.c: remove g_return_if_fail() from private
......
...@@ -1698,34 +1698,5 @@ _gtk_binding_reset_parsed (void) ...@@ -1698,34 +1698,5 @@ _gtk_binding_reset_parsed (void)
} }
} }
guint
_gtk_binding_signal_new (const gchar *signal_name,
GType itype,
GSignalFlags signal_flags,
GCallback handler,
GSignalAccumulator accumulator,
gpointer accu_data,
GSignalCMarshaller c_marshaller,
GType return_type,
guint n_params,
...)
{
va_list args;
guint signal_id;
g_return_val_if_fail (signal_name != NULL, 0);
va_start (args, n_params);
signal_id = g_signal_new_valist (signal_name, itype, signal_flags,
g_cclosure_new (handler, NULL, NULL),
accumulator, accu_data, c_marshaller,
return_type, n_params, args);
va_end (args);
return signal_id;
}
#define __GTK_BINDINGS_C__ #define __GTK_BINDINGS_C__
#include "gtkaliasdef.c" #include "gtkaliasdef.c"
...@@ -154,21 +154,6 @@ void _gtk_binding_entry_add_signall (GtkBindingSet *binding_set, ...@@ -154,21 +154,6 @@ void _gtk_binding_entry_add_signall (GtkBindingSet *binding_set,
const gchar *signal_name, const gchar *signal_name,
GSList *binding_args); GSList *binding_args);
/* Creates a signal with a fixed callback instead of a class offset;
* useful for key binding signals
*/
guint _gtk_binding_signal_new (const gchar *signal_name,
GType itype,
GSignalFlags signal_flags,
GCallback handler,
GSignalAccumulator accumulator,
gpointer accu_data,
GSignalCMarshaller c_marshaller,
GType return_type,
guint n_params,
...);
G_END_DECLS G_END_DECLS
#endif /* __GTK_BINDINGS_H__ */ #endif /* __GTK_BINDINGS_H__ */
...@@ -540,14 +540,14 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass) ...@@ -540,14 +540,14 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
* Since: 2.12 * Since: 2.12
*/ */
combo_box_signals[MOVE_ACTIVE] = combo_box_signals[MOVE_ACTIVE] =
_gtk_binding_signal_new (I_("move-active"), g_signal_new_class_handler (I_("move-active"),
G_OBJECT_CLASS_TYPE (klass), G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_combo_box_real_move_active), G_CALLBACK (gtk_combo_box_real_move_active),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__ENUM, g_cclosure_marshal_VOID__ENUM,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
GTK_TYPE_SCROLL_TYPE); GTK_TYPE_SCROLL_TYPE);
/** /**
* GtkComboBox::popup: * GtkComboBox::popup:
...@@ -562,13 +562,13 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass) ...@@ -562,13 +562,13 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
* Since: 2.12 * Since: 2.12
*/ */
combo_box_signals[POPUP] = combo_box_signals[POPUP] =
_gtk_binding_signal_new (I_("popup"), g_signal_new_class_handler (I_("popup"),
G_OBJECT_CLASS_TYPE (klass), G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_combo_box_real_popup), G_CALLBACK (gtk_combo_box_real_popup),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
* GtkComboBox::popdown: * GtkComboBox::popdown:
* @button: the object which received the signal * @button: the object which received the signal
...@@ -582,13 +582,13 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass) ...@@ -582,13 +582,13 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
* Since: 2.12 * Since: 2.12
*/ */
combo_box_signals[POPDOWN] = combo_box_signals[POPDOWN] =
_gtk_binding_signal_new (I_("popdown"), g_signal_new_class_handler (I_("popdown"),
G_OBJECT_CLASS_TYPE (klass), G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_combo_box_real_popdown), G_CALLBACK (gtk_combo_box_real_popdown),
NULL, NULL, NULL, NULL,
_gtk_marshal_BOOLEAN__VOID, _gtk_marshal_BOOLEAN__VOID,
G_TYPE_BOOLEAN, 0); G_TYPE_BOOLEAN, 0);
/* key bindings */ /* key bindings */
binding_set = gtk_binding_set_by_class (widget_class); binding_set = gtk_binding_set_by_class (widget_class);
......
...@@ -570,93 +570,103 @@ _gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class) ...@@ -570,93 +570,103 @@ _gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class)
widget_class->size_allocate = gtk_file_chooser_default_size_allocate; widget_class->size_allocate = gtk_file_chooser_default_size_allocate;
signals[LOCATION_POPUP] = signals[LOCATION_POPUP] =
_gtk_binding_signal_new (I_("location-popup"), g_signal_new_class_handler (I_("location-popup"),
G_OBJECT_CLASS_TYPE (class), G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_CALLBACK (location_popup_handler), G_CALLBACK (location_popup_handler),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__STRING, _gtk_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING); G_TYPE_NONE, 1, G_TYPE_STRING);
signals[LOCATION_POPUP_ON_PASTE] = signals[LOCATION_POPUP_ON_PASTE] =
_gtk_binding_signal_new ("location-popup-on-paste", g_signal_new_class_handler (I_("location-popup-on-paste"),
G_OBJECT_CLASS_TYPE (class), G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_CALLBACK (location_popup_on_paste_handler), G_CALLBACK (location_popup_on_paste_handler),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
signals[LOCATION_TOGGLE_POPUP] = signals[LOCATION_TOGGLE_POPUP] =
_gtk_binding_signal_new (I_("location-toggle-popup"), g_signal_new_class_handler (I_("location-toggle-popup"),
G_OBJECT_CLASS_TYPE (class), G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_CALLBACK (location_toggle_popup_handler), G_CALLBACK (location_toggle_popup_handler),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
signals[UP_FOLDER] = signals[UP_FOLDER] =
_gtk_binding_signal_new (I_("up-folder"), g_signal_new_class_handler (I_("up-folder"),
G_OBJECT_CLASS_TYPE (class), G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_CALLBACK (up_folder_handler), G_CALLBACK (up_folder_handler),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
signals[DOWN_FOLDER] = signals[DOWN_FOLDER] =
_gtk_binding_signal_new (I_("down-folder"), g_signal_new_class_handler (I_("down-folder"),
G_OBJECT_CLASS_TYPE (class), G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_CALLBACK (down_folder_handler), G_CALLBACK (down_folder_handler),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
signals[HOME_FOLDER] = signals[HOME_FOLDER] =
_gtk_binding_signal_new (I_("home-folder"), g_signal_new_class_handler (I_("home-folder"),
G_OBJECT_CLASS_TYPE (class), G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_CALLBACK (home_folder_handler), G_CALLBACK (home_folder_handler),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
signals[DESKTOP_FOLDER] = signals[DESKTOP_FOLDER] =
_gtk_binding_signal_new (I_("desktop-folder"), g_signal_new_class_handler (I_("desktop-folder"),
G_OBJECT_CLASS_TYPE (class), G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_CALLBACK (desktop_folder_handler), G_CALLBACK (desktop_folder_handler),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
signals[QUICK_BOOKMARK] = signals[QUICK_BOOKMARK] =
_gtk_binding_signal_new (I_("quick-bookmark"), g_signal_new_class_handler (I_("quick-bookmark"),
G_OBJECT_CLASS_TYPE (class), G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_CALLBACK (quick_bookmark_handler), G_CALLBACK (quick_bookmark_handler),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__INT, _gtk_marshal_VOID__INT,
G_TYPE_NONE, 1, G_TYPE_INT); G_TYPE_NONE, 1, G_TYPE_INT);
signals[SHOW_HIDDEN] = signals[SHOW_HIDDEN] =
_gtk_binding_signal_new ("show-hidden", g_signal_new_class_handler (I_("show-hidden"),
G_OBJECT_CLASS_TYPE (class), G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_CALLBACK (show_hidden_handler), G_CALLBACK (show_hidden_handler),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
signals[SEARCH_SHORTCUT] = signals[SEARCH_SHORTCUT] =
_gtk_binding_signal_new ("search-shortcut", g_signal_new_class_handler (I_("search-shortcut"),
G_OBJECT_CLASS_TYPE (class), G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_CALLBACK (search_shortcut_handler), G_CALLBACK (search_shortcut_handler),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
signals[RECENT_SHORTCUT] = signals[RECENT_SHORTCUT] =
_gtk_binding_signal_new ("recent-shortcut", g_signal_new_class_handler (I_("recent-shortcut"),
G_OBJECT_CLASS_TYPE (class), G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_CALLBACK (recent_shortcut_handler), G_CALLBACK (recent_shortcut_handler),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
binding_set = gtk_binding_set_by_class (class); binding_set = gtk_binding_set_by_class (class);
......
...@@ -479,14 +479,14 @@ gtk_menu_class_init (GtkMenuClass *class) ...@@ -479,14 +479,14 @@ gtk_menu_class_init (GtkMenuClass *class)
menu_shell_class->move_current = gtk_menu_move_current; menu_shell_class->move_current = gtk_menu_move_current;
menu_signals[MOVE_SCROLL] = menu_signals[MOVE_SCROLL] =
_gtk_binding_signal_new (I_("move_scroll"), g_signal_new_class_handler (I_("move_scroll"),
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_menu_real_move_scroll), G_CALLBACK (gtk_menu_real_move_scroll),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__ENUM, _gtk_marshal_VOID__ENUM,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
GTK_TYPE_SCROLL_TYPE); GTK_TYPE_SCROLL_TYPE);
/** /**
* GtkMenu:active: * GtkMenu:active:
......
...@@ -250,6 +250,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) ...@@ -250,6 +250,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
menu_shell_signals[SELECTION_DONE] = menu_shell_signals[SELECTION_DONE] =
g_signal_new (I_("selection-done"), g_signal_new (I_("selection-done"),
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
...@@ -258,6 +259,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) ...@@ -258,6 +259,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
menu_shell_signals[MOVE_CURRENT] = menu_shell_signals[MOVE_CURRENT] =
g_signal_new (I_("move_current"), g_signal_new (I_("move_current"),
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
...@@ -265,8 +267,9 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) ...@@ -265,8 +267,9 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
G_STRUCT_OFFSET (GtkMenuShellClass, move_current), G_STRUCT_OFFSET (GtkMenuShellClass, move_current),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__ENUM, _gtk_marshal_VOID__ENUM,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
GTK_TYPE_MENU_DIRECTION_TYPE); GTK_TYPE_MENU_DIRECTION_TYPE);
menu_shell_signals[ACTIVATE_CURRENT] = menu_shell_signals[ACTIVATE_CURRENT] =
g_signal_new (I_("activate_current"), g_signal_new (I_("activate_current"),
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
...@@ -274,8 +277,9 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) ...@@ -274,8 +277,9 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
G_STRUCT_OFFSET (GtkMenuShellClass, activate_current), G_STRUCT_OFFSET (GtkMenuShellClass, activate_current),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__BOOLEAN, _gtk_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
G_TYPE_BOOLEAN); G_TYPE_BOOLEAN);
menu_shell_signals[CANCEL] = menu_shell_signals[CANCEL] =
g_signal_new (I_("cancel"), g_signal_new (I_("cancel"),
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
...@@ -284,27 +288,29 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) ...@@ -284,27 +288,29 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
menu_shell_signals[CYCLE_FOCUS] = menu_shell_signals[CYCLE_FOCUS] =
_gtk_binding_signal_new (I_("cycle_focus"), g_signal_new_class_handler (I_("cycle_focus"),
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_real_menu_shell_cycle_focus), G_CALLBACK (gtk_real_menu_shell_cycle_focus),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__ENUM, _gtk_marshal_VOID__ENUM,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
GTK_TYPE_DIRECTION_TYPE); GTK_TYPE_DIRECTION_TYPE);
/** /**
* GtkMenuShell::move-selected: * GtkMenuShell::move-selected:
* @menu_shell: the object on which the signal is emitted * @menu_shell: the object on which the signal is emitted
* @distance: +1 to move to the next item, -1 to move to the previous * @distance: +1 to move to the next item, -1 to move to the previous
* *
* The ::move-selected signal is emitted to move the selection to * The ::move-selected signal is emitted to move the selection to
* another item. * another item.
* *
* Returns: %TRUE to stop the signal emission, %FALSE to continue * Returns: %TRUE to stop the signal emission, %FALSE to continue
* *
* Since: 2.12 * Since: 2.12
*/ */
menu_shell_signals[MOVE_SELECTED] = menu_shell_signals[MOVE_SELECTED] =
g_signal_new (I_("move_selected"), g_signal_new (I_("move_selected"),
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
......
...@@ -282,13 +282,13 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass) ...@@ -282,13 +282,13 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass)
* Since: 2.12 * Since: 2.12
*/ */
signals[POPUP] = signals[POPUP] =
_gtk_binding_signal_new (I_("popup"), g_signal_new_class_handler (I_("popup"),
G_OBJECT_CLASS_TYPE (klass), G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_scale_button_popup), G_CALLBACK (gtk_scale_button_popup),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
* GtkScaleButton::popdown: * GtkScaleButton::popdown:
...@@ -303,13 +303,13 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass) ...@@ -303,13 +303,13 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass)
* Since: 2.12 * Since: 2.12
*/ */
signals[POPDOWN] = signals[POPDOWN] =
_gtk_binding_signal_new (I_("popdown"), g_signal_new_class_handler (I_("popdown"),
G_OBJECT_CLASS_TYPE (klass), G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_scale_button_popdown), G_CALLBACK (gtk_scale_button_popdown),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/* Key bindings */ /* Key bindings */
binding_set = gtk_binding_set_by_class (widget_class); binding_set = gtk_binding_set_by_class (widget_class);
......
...@@ -756,15 +756,15 @@ gtk_text_view_class_init (GtkTextViewClass *klass) ...@@ -756,15 +756,15 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
* There are no default bindings for this signal. * There are no default bindings for this signal.
*/ */
signals[MOVE_VIEWPORT] = signals[MOVE_VIEWPORT] =
_gtk_binding_signal_new (I_("move_viewport"), g_signal_new_class_handler (I_("move_viewport"),
G_OBJECT_CLASS_TYPE (gobject_class), G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_text_view_move_viewport), G_CALLBACK (gtk_text_view_move_viewport),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__ENUM_INT, _gtk_marshal_VOID__ENUM_INT,
G_TYPE_NONE, 2, G_TYPE_NONE, 2,
GTK_TYPE_SCROLL_STEP, GTK_TYPE_SCROLL_STEP,
G_TYPE_INT); G_TYPE_INT);
signals[SET_ANCHOR] = signals[SET_ANCHOR] =
g_signal_new (I_("set_anchor"), g_signal_new (I_("set_anchor"),
...@@ -951,13 +951,13 @@ gtk_text_view_class_init (GtkTextViewClass *klass) ...@@ -951,13 +951,13 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
* for selecting and Shift-Ctrl-a and Ctrl-\ for unselecting. * for selecting and Shift-Ctrl-a and Ctrl-\ for unselecting.
*/ */
signals[SELECT_ALL] = signals[SELECT_ALL] =
_gtk_binding_signal_new (I_("select_all"), g_signal_new_class_handler (I_("select_all"),
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_text_view_select_all), G_CALLBACK (gtk_text_view_select_all),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__BOOLEAN, _gtk_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN); G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
/** /**
* GtkTextView::toggle-cursor-visible: * GtkTextView::toggle-cursor-visible:
...@@ -970,13 +970,13 @@ gtk_text_view_class_init (GtkTextViewClass *klass) ...@@ -970,13 +970,13 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
* The default binding for this signal is F7. * The default binding for this signal is F7.
*/ */
signals[TOGGLE_CURSOR_VISIBLE] = signals[TOGGLE_CURSOR_VISIBLE] =
_gtk_binding_signal_new (I_("toggle_cursor_visible"), g_signal_new_class_handler (I_("toggle_cursor_visible"),
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_text_view_toggle_cursor_visible), G_CALLBACK (gtk_text_view_toggle_cursor_visible),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/* /*
* Key bindings * Key bindings
......
...@@ -478,15 +478,15 @@ gtk_toolbar_class_init (GtkToolbarClass *klass) ...@@ -478,15 +478,15 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
* Return value: %TRUE if the signal was handled, %FALSE if not * Return value: %TRUE if the signal was handled, %FALSE if not
*/ */
toolbar_signals[FOCUS_HOME_OR_END] = toolbar_signals[FOCUS_HOME_OR_END] =
_gtk_binding_signal_new (I_("focus_home_or_end"), g_signal_new_class_handler (I_("focus_home_or_end"),
G_OBJECT_CLASS_TYPE (klass), G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_toolbar_focus_home_or_end), G_CALLBACK (gtk_toolbar_focus_home_or_end),
NULL, NULL, NULL, NULL,
_gtk_marshal_BOOLEAN__BOOLEAN, _gtk_marshal_BOOLEAN__BOOLEAN,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
G_TYPE_BOOLEAN); G_TYPE_BOOLEAN);
/* properties */ /* properties */
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_ORIENTATION, PROP_ORIENTATION,
......
...@@ -914,15 +914,15 @@ gtk_widget_class_init (GtkWidgetClass *klass) ...@@ -914,15 +914,15 @@ gtk_widget_class_init (GtkWidgetClass *klass)
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
GTK_TYPE_DIRECTION_TYPE); GTK_TYPE_DIRECTION_TYPE);
widget_signals[MOVE_FOCUS] = widget_signals[MOVE_FOCUS] =
_gtk_binding_signal_new (I_("move_focus"), g_signal_new_class_handler (I_("move_focus"),
G_TYPE_FROM_CLASS (object_class), G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_widget_real_move_focus), G_CALLBACK (gtk_widget_real_move_focus),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__ENUM, _gtk_marshal_VOID__ENUM,
G_TYPE_NONE, G_TYPE_NONE,
1, 1,
GTK_TYPE_DIRECTION_TYPE); GTK_TYPE_DIRECTION_TYPE);
/** /**
* GtkWidget::event: * GtkWidget::event:
* @widget: the object which received the signal. * @widget: the object which received the signal.
...@@ -1106,14 +1106,14 @@ gtk_widget_class_init (GtkWidgetClass *klass) ...@@ -1106,14 +1106,14 @@ gtk_widget_class_init (GtkWidgetClass *klass)
* Since: 2.12 * Since: 2.12
**/ **/
widget_signals[KEYNAV_FAILED] = widget_signals[KEYNAV_FAILED] =
_gtk_binding_signal_new (I_("keynav-failed"), g_signal_new_class_handler (I_("keynav-failed"),
G_TYPE_FROM_CLASS (gobject_class), G_TYPE_FROM_CLASS (gobject_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_CALLBACK (gtk_widget_real_keynav_failed), G_CALLBACK (gtk_widget_real_keynav_failed),
_gtk_boolean_handled_accumulator, NULL, _gtk_boolean_handled_accumulator, NULL,
_gtk_marshal_BOOLEAN__ENUM, _gtk_marshal_BOOLEAN__ENUM,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
GTK_TYPE_DIRECTION_TYPE); GTK_TYPE_DIRECTION_TYPE);
/** /**
* GtkWidget::delete-event: * GtkWidget::delete-event:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment