diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index da36c58f3f..2c7f6a13d5 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -547,7 +547,6 @@ enum { DRAG_DATA_GET, DRAG_DATA_RECEIVED, POPUP_MENU, - SHOW_HELP, ACCEL_CLOSURES_CHANGED, SCREEN_CHANGED, CAN_ACTIVATE_ACCEL, @@ -642,8 +641,6 @@ static gboolean gtk_widget_real_query_tooltip (GtkWidget *widget, gboolean keyboard_tip, GtkTooltip *tooltip); static void gtk_widget_real_style_updated (GtkWidget *widget); -static gboolean gtk_widget_real_show_help (GtkWidget *widget, - GtkWidgetHelpType help_type); static gboolean _gtk_widget_run_controllers (GtkWidget *widget, const GdkEvent *event, GtkPropagationPhase phase); @@ -1056,8 +1053,6 @@ gtk_widget_class_init (GtkWidgetClass *klass) klass->query_tooltip = gtk_widget_real_query_tooltip; klass->style_updated = gtk_widget_real_style_updated; - klass->show_help = gtk_widget_real_show_help; - /* Accessibility support */ klass->priv->accessible_type = GTK_TYPE_ACCESSIBLE; klass->priv->accessible_role = ATK_ROLE_INVALID; @@ -3108,24 +3103,6 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); - /** - * GtkWidget::show-help: - * @widget: the object which received the signal. - * @help_type: - * - * Returns: %TRUE to stop other handlers from being invoked for the event. - * %FALSE to propagate the event further. - */ - widget_signals[SHOW_HELP] = - g_signal_new (I_("show-help"), - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GtkWidgetClass, show_help), - _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__ENUM, - G_TYPE_BOOLEAN, 1, - GTK_TYPE_WIDGET_HELP_TYPE); - /** * GtkWidget::accel-closures-changed: * @widget: the object which received the signal. @@ -3186,23 +3163,6 @@ gtk_widget_class_init (GtkWidgetClass *klass) gtk_binding_entry_add_signal (binding_set, GDK_KEY_Menu, 0, "popup-menu", 0); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_F1, GDK_CONTROL_MASK, - "show-help", 1, - GTK_TYPE_WIDGET_HELP_TYPE, - GTK_WIDGET_HELP_TOOLTIP); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_F1, GDK_CONTROL_MASK, - "show-help", 1, - GTK_TYPE_WIDGET_HELP_TYPE, - GTK_WIDGET_HELP_TOOLTIP); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_F1, GDK_SHIFT_MASK, - "show-help", 1, - GTK_TYPE_WIDGET_HELP_TYPE, - GTK_WIDGET_HELP_WHATS_THIS); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_F1, GDK_SHIFT_MASK, - "show-help", 1, - GTK_TYPE_WIDGET_HELP_TYPE, - GTK_WIDGET_HELP_WHATS_THIS); - gtk_widget_class_set_accessible_type (klass, GTK_TYPE_WIDGET_ACCESSIBLE); gtk_widget_class_set_css_name (klass, "widget"); } @@ -7442,20 +7402,6 @@ gtk_widget_real_style_updated (GtkWidget *widget) } } -static gboolean -gtk_widget_real_show_help (GtkWidget *widget, - GtkWidgetHelpType help_type) -{ - if (help_type == GTK_WIDGET_HELP_TOOLTIP) - { - _gtk_tooltip_toggle_keyboard_mode (widget); - - return TRUE; - } - else - return FALSE; -} - static gboolean gtk_widget_real_focus (GtkWidget *widget, GtkDirectionType direction) diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index 7187c5d9e5..1929aaaa9f 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -38,20 +38,6 @@ G_BEGIN_DECLS -/* Kinds of widget-specific help */ -/** - * GtkWidgetHelpType: - * @GTK_WIDGET_HELP_TOOLTIP: Tooltip. - * @GTK_WIDGET_HELP_WHATS_THIS: What’s this. - * - * Kinds of widget-specific help. Used by the ::show-help signal. - */ -typedef enum -{ - GTK_WIDGET_HELP_TOOLTIP, - GTK_WIDGET_HELP_WHATS_THIS -} GtkWidgetHelpType; - /* Macro for casting a pointer to a GtkWidget or GtkWidgetClass pointer. * Macros for testing whether widget or klass are of type GTK_TYPE_WIDGET. */ @@ -281,7 +267,6 @@ struct _GtkWidget * failed. * @popup_menu: Signal emitted whenever a widget should pop up a * context menu. - * @show_help: * @get_accessible: Returns the accessible object that describes the * widget to an assistive technology. * @screen_changed: Signal emitted when the screen of a widget has @@ -505,14 +490,6 @@ struct _GtkWidgetClass /* Signals used only for keybindings */ gboolean (* popup_menu) (GtkWidget *widget); - /* If a widget has multiple tooltips/whatsthis, it should show the - * one for the current focus location, or if that doesn't make - * sense, should cycle through them showing each tip alongside - * whatever piece of the widget it applies to. - */ - gboolean (* show_help) (GtkWidget *widget, - GtkWidgetHelpType help_type); - /* accessibility support */ AtkObject * (* get_accessible) (GtkWidget *widget);