forked from AuroraMiddleware/gtk
gtk/gtkaboutdialog.c gtk/gtkcellrendereraccel.c gtk/gtkcellrenderercombo.c
2008-08-11 Sven Neumann <sven@gimp.org> * gtk/gtkaboutdialog.c * gtk/gtkcellrendereraccel.c * gtk/gtkcellrenderercombo.c * gtk/gtkcellrendererspin.c * gtk/gtkcellrenderertext.c * gtk/gtkclipboard.c * gtk/gtkcolorsel.c * gtk/gtkcombo.c * gtk/gtkcombobox.c * gtk/gtkdnd-quartz.c * gtk/gtkdnd.c * gtk/gtkentry.c * gtk/gtkentrycompletion.c * gtk/gtkfilechooserbutton.c * gtk/gtkfilechooserdefault.c * gtk/gtkfilechooserentry.c * gtk/gtkfontsel.c * gtk/gtkinputdialog.c * gtk/gtkmenutoolbutton.c * gtk/gtkpathbar.c * gtk/gtktooltip.c: use canonical signal names in g_signal_connect(). svn path=/trunk/; revision=21060
This commit is contained in:
Sven Neumann
Sven Neumann
parent
f6176316ca
commit
2a95978506
24
ChangeLog
24
ChangeLog
@ -1,3 +1,27 @@
|
||||
2008-08-11 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* gtk/gtkaboutdialog.c
|
||||
* gtk/gtkcellrendereraccel.c
|
||||
* gtk/gtkcellrenderercombo.c
|
||||
* gtk/gtkcellrendererspin.c
|
||||
* gtk/gtkcellrenderertext.c
|
||||
* gtk/gtkclipboard.c
|
||||
* gtk/gtkcolorsel.c
|
||||
* gtk/gtkcombo.c
|
||||
* gtk/gtkcombobox.c
|
||||
* gtk/gtkdnd-quartz.c
|
||||
* gtk/gtkdnd.c
|
||||
* gtk/gtkentry.c
|
||||
* gtk/gtkentrycompletion.c
|
||||
* gtk/gtkfilechooserbutton.c
|
||||
* gtk/gtkfilechooserdefault.c
|
||||
* gtk/gtkfilechooserentry.c
|
||||
* gtk/gtkfontsel.c
|
||||
* gtk/gtkinputdialog.c
|
||||
* gtk/gtkmenutoolbutton.c
|
||||
* gtk/gtkpathbar.c
|
||||
* gtk/gtktooltip.c: use canonical signal names in g_signal_connect().
|
||||
|
||||
2008-08-11 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* gdk/gdkkeys.c
|
||||
|
||||
@ -505,7 +505,8 @@ gtk_about_dialog_init (GtkAboutDialog *about)
|
||||
gtk_box_pack_end (GTK_BOX (GTK_DIALOG (about)->action_area),
|
||||
button, FALSE, TRUE, 0);
|
||||
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (GTK_DIALOG (about)->action_area), button, TRUE);
|
||||
g_signal_connect (button, "clicked", G_CALLBACK (display_credits_dialog), about);
|
||||
g_signal_connect (button, "clicked",
|
||||
G_CALLBACK (display_credits_dialog), about);
|
||||
priv->credits_button = button;
|
||||
priv->credits_dialog = NULL;
|
||||
|
||||
@ -516,7 +517,8 @@ gtk_about_dialog_init (GtkAboutDialog *about)
|
||||
gtk_box_pack_end (GTK_BOX (GTK_DIALOG (about)->action_area),
|
||||
button, FALSE, TRUE, 0);
|
||||
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (GTK_DIALOG (about)->action_area), button, TRUE);
|
||||
g_signal_connect (button, "clicked", G_CALLBACK (display_license_dialog), about);
|
||||
g_signal_connect (button, "clicked",
|
||||
G_CALLBACK (display_license_dialog), about);
|
||||
priv->license_button = button;
|
||||
priv->license_dialog = NULL;
|
||||
|
||||
@ -1900,7 +1902,7 @@ add_credits_page (GtkAboutDialog *about,
|
||||
visited_link_color = default_visited_link_color;
|
||||
|
||||
view = gtk_text_view_new ();
|
||||
g_signal_connect_object (about, "style_set",
|
||||
g_signal_connect_object (about, "style-set",
|
||||
G_CALLBACK (text_view_style_set), view, 0);
|
||||
|
||||
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
|
||||
@ -1910,13 +1912,13 @@ add_credits_page (GtkAboutDialog *about,
|
||||
gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 8);
|
||||
gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view), 8);
|
||||
|
||||
g_signal_connect (view, "key_press_event",
|
||||
g_signal_connect (view, "key-press-event",
|
||||
G_CALLBACK (credits_key_press_event), about);
|
||||
g_signal_connect (view, "event_after",
|
||||
g_signal_connect (view, "event-after",
|
||||
G_CALLBACK (credits_event_after), about);
|
||||
g_signal_connect (view, "motion_notify_event",
|
||||
g_signal_connect (view, "motion-notify-event",
|
||||
G_CALLBACK (credits_motion_notify_event), about);
|
||||
g_signal_connect (view, "visibility_notify_event",
|
||||
g_signal_connect (view, "visibility-notify-event",
|
||||
G_CALLBACK (credits_visibility_notify_event), about);
|
||||
|
||||
sw = gtk_scrolled_window_new (NULL, NULL);
|
||||
@ -2288,10 +2290,12 @@ gtk_show_about_dialog (GtkWindow *parent,
|
||||
|
||||
g_object_ref_sink (dialog);
|
||||
|
||||
g_signal_connect (dialog, "delete_event", G_CALLBACK (gtk_widget_hide_on_delete), NULL);
|
||||
g_signal_connect (dialog, "delete-event",
|
||||
G_CALLBACK (gtk_widget_hide_on_delete), NULL);
|
||||
|
||||
/* Close dialog on user response */
|
||||
g_signal_connect (dialog, "response", G_CALLBACK (close_cb), NULL);
|
||||
g_signal_connect (dialog, "response",
|
||||
G_CALLBACK (close_cb), NULL);
|
||||
|
||||
va_start (var_args, first_property_name);
|
||||
g_object_set_valist (G_OBJECT (dialog), first_property_name, var_args);
|
||||
|
||||
@ -555,7 +555,7 @@ gtk_cell_renderer_accel_start_editing (GtkCellRenderer *cell,
|
||||
|
||||
accel->grab_widget = widget;
|
||||
|
||||
g_signal_connect (G_OBJECT (widget), "key_press_event",
|
||||
g_signal_connect (G_OBJECT (widget), "key-press-event",
|
||||
G_CALLBACK (grab_key_callback),
|
||||
accel);
|
||||
|
||||
|
||||
@ -486,14 +486,14 @@ gtk_cell_renderer_combo_start_editing (GtkCellRenderer *cell,
|
||||
|
||||
gtk_widget_show (combo);
|
||||
|
||||
g_signal_connect (GTK_CELL_EDITABLE (combo), "editing_done",
|
||||
g_signal_connect (GTK_CELL_EDITABLE (combo), "editing-done",
|
||||
G_CALLBACK (gtk_cell_renderer_combo_editing_done),
|
||||
cell_combo);
|
||||
g_signal_connect (GTK_CELL_EDITABLE (combo), "changed",
|
||||
G_CALLBACK (gtk_cell_renderer_combo_changed),
|
||||
cell_combo);
|
||||
cell_combo->focus_out_id =
|
||||
g_signal_connect (combo, "focus_out_event",
|
||||
g_signal_connect (combo, "focus-out-event",
|
||||
G_CALLBACK (gtk_cell_renderer_combo_focus_out_event),
|
||||
cell_combo);
|
||||
|
||||
|
||||
@ -303,10 +303,10 @@ gtk_cell_renderer_spin_start_editing (GtkCellRenderer *cell,
|
||||
g_object_set_data_full (G_OBJECT (spin), GTK_CELL_RENDERER_SPIN_PATH,
|
||||
g_strdup (path), g_free);
|
||||
|
||||
g_signal_connect (G_OBJECT (spin), "focus_out_event",
|
||||
g_signal_connect (G_OBJECT (spin), "focus-out-event",
|
||||
G_CALLBACK (gtk_cell_renderer_spin_focus_out_event),
|
||||
cell);
|
||||
g_signal_connect (G_OBJECT (spin), "key_press_event",
|
||||
g_signal_connect (G_OBJECT (spin), "key-press-event",
|
||||
G_CALLBACK (gtk_cell_renderer_spin_key_press_event),
|
||||
cell);
|
||||
|
||||
|
||||
@ -1875,14 +1875,14 @@ gtk_cell_renderer_text_start_editing (GtkCellRenderer *cell,
|
||||
}
|
||||
|
||||
g_signal_connect (priv->entry,
|
||||
"editing_done",
|
||||
"editing-done",
|
||||
G_CALLBACK (gtk_cell_renderer_text_editing_done),
|
||||
celltext);
|
||||
priv->focus_out_id = g_signal_connect_after (priv->entry, "focus_out_event",
|
||||
priv->focus_out_id = g_signal_connect_after (priv->entry, "focus-out-event",
|
||||
G_CALLBACK (gtk_cell_renderer_text_focus_out_event),
|
||||
celltext);
|
||||
priv->populate_popup_id =
|
||||
g_signal_connect (priv->entry, "populate_popup",
|
||||
g_signal_connect (priv->entry, "populate-popup",
|
||||
G_CALLBACK (gtk_cell_renderer_text_populate_popup),
|
||||
celltext);
|
||||
|
||||
|
||||
@ -361,7 +361,7 @@ make_clipboard_widget (GdkDisplay *display,
|
||||
{
|
||||
GtkWidget *widget = gtk_invisible_new_for_screen (gdk_display_get_default_screen (display));
|
||||
|
||||
g_signal_connect (widget, "selection_received",
|
||||
g_signal_connect (widget, "selection-received",
|
||||
G_CALLBACK (selection_received), NULL);
|
||||
|
||||
if (provider)
|
||||
@ -369,9 +369,9 @@ make_clipboard_widget (GdkDisplay *display,
|
||||
/* We need this for gdk_x11_get_server_time() */
|
||||
gtk_widget_add_events (widget, GDK_PROPERTY_CHANGE_MASK);
|
||||
|
||||
g_signal_connect (widget, "selection_get",
|
||||
g_signal_connect (widget, "selection-get",
|
||||
G_CALLBACK (selection_get_cb), NULL);
|
||||
g_signal_connect (widget, "selection_clear_event",
|
||||
g_signal_connect (widget, "selection-clear-event",
|
||||
G_CALLBACK (selection_clear_event_cb), NULL);
|
||||
}
|
||||
|
||||
@ -2011,7 +2011,7 @@ gtk_clipboard_store (GtkClipboard *clipboard)
|
||||
g_object_ref (clipboard);
|
||||
|
||||
clipboard_widget = get_clipboard_widget (clipboard->display);
|
||||
clipboard->notify_signal_id = g_signal_connect (clipboard_widget, "selection_notify_event",
|
||||
clipboard->notify_signal_id = g_signal_connect (clipboard_widget, "selection-notify_event",
|
||||
G_CALLBACK (gtk_clipboard_selection_notify), clipboard);
|
||||
|
||||
gdk_display_store_clipboard (clipboard->display,
|
||||
|
||||
@ -433,7 +433,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
|
||||
g_signal_connect (priv->hex_entry, "activate",
|
||||
G_CALLBACK (hex_changed), colorsel);
|
||||
|
||||
g_signal_connect (priv->hex_entry, "focus_out_event",
|
||||
g_signal_connect (priv->hex_entry, "focus-out-event",
|
||||
G_CALLBACK (hex_focus_out), colorsel);
|
||||
|
||||
gtk_widget_set_tooltip_text (priv->hex_entry,
|
||||
@ -918,8 +918,7 @@ color_sample_setup_dnd (GtkColorSelection *colorsel, GtkWidget *sample)
|
||||
targets, 1,
|
||||
GDK_ACTION_COPY | GDK_ACTION_MOVE);
|
||||
|
||||
g_signal_connect (sample,
|
||||
"drag_begin",
|
||||
g_signal_connect (sample, "drag-begin",
|
||||
G_CALLBACK (color_sample_drag_begin),
|
||||
colorsel);
|
||||
if (sample == priv->cur_sample)
|
||||
@ -932,18 +931,15 @@ color_sample_setup_dnd (GtkColorSelection *colorsel, GtkWidget *sample)
|
||||
targets, 1,
|
||||
GDK_ACTION_COPY);
|
||||
|
||||
g_signal_connect (sample,
|
||||
"drag_end",
|
||||
g_signal_connect (sample, "drag-end",
|
||||
G_CALLBACK (color_sample_drag_end),
|
||||
colorsel);
|
||||
}
|
||||
|
||||
g_signal_connect (sample,
|
||||
"drag_data_get",
|
||||
g_signal_connect (sample, "drag-data-get",
|
||||
G_CALLBACK (color_sample_drag_handle),
|
||||
colorsel);
|
||||
g_signal_connect (sample,
|
||||
"drag_data_received",
|
||||
g_signal_connect (sample, "drag-data-received",
|
||||
G_CALLBACK (color_sample_drop_handle),
|
||||
colorsel);
|
||||
|
||||
@ -966,10 +962,10 @@ color_sample_new (GtkColorSelection *colorsel)
|
||||
gtk_box_pack_start (GTK_BOX (priv->sample_area), priv->cur_sample,
|
||||
TRUE, TRUE, 0);
|
||||
|
||||
g_signal_connect (priv->old_sample, "expose_event",
|
||||
g_signal_connect (priv->old_sample, "expose-event",
|
||||
G_CALLBACK (color_old_sample_expose),
|
||||
colorsel);
|
||||
g_signal_connect (priv->cur_sample, "expose_event",
|
||||
g_signal_connect (priv->cur_sample, "expose-event",
|
||||
G_CALLBACK (color_cur_sample_expose),
|
||||
colorsel);
|
||||
|
||||
@ -1270,12 +1266,10 @@ palette_set_color (GtkWidget *drawing_area,
|
||||
targets, 1,
|
||||
GDK_ACTION_COPY | GDK_ACTION_MOVE);
|
||||
|
||||
g_signal_connect (drawing_area,
|
||||
"drag_begin",
|
||||
g_signal_connect (drawing_area, "drag-begin",
|
||||
G_CALLBACK (palette_drag_begin),
|
||||
colorsel);
|
||||
g_signal_connect (drawing_area,
|
||||
"drag_data_get",
|
||||
g_signal_connect (drawing_area, "drag-data-get",
|
||||
G_CALLBACK (palette_drag_handle),
|
||||
colorsel);
|
||||
|
||||
@ -1543,19 +1537,19 @@ palette_new (GtkColorSelection *colorsel)
|
||||
| GDK_ENTER_NOTIFY_MASK
|
||||
| GDK_LEAVE_NOTIFY_MASK);
|
||||
|
||||
g_signal_connect (retval, "expose_event",
|
||||
g_signal_connect (retval, "expose-event",
|
||||
G_CALLBACK (palette_expose), colorsel);
|
||||
g_signal_connect (retval, "button_press_event",
|
||||
g_signal_connect (retval, "button-press-event",
|
||||
G_CALLBACK (palette_press), colorsel);
|
||||
g_signal_connect (retval, "button_release_event",
|
||||
g_signal_connect (retval, "button-release-event",
|
||||
G_CALLBACK (palette_release), colorsel);
|
||||
g_signal_connect (retval, "enter_notify_event",
|
||||
g_signal_connect (retval, "enter-notify-event",
|
||||
G_CALLBACK (palette_enter), colorsel);
|
||||
g_signal_connect (retval, "leave_notify_event",
|
||||
g_signal_connect (retval, "leave-notify-event",
|
||||
G_CALLBACK (palette_leave), colorsel);
|
||||
g_signal_connect (retval, "key_press_event",
|
||||
g_signal_connect (retval, "key-press-event",
|
||||
G_CALLBACK (palette_activate), colorsel);
|
||||
g_signal_connect (retval, "popup_menu",
|
||||
g_signal_connect (retval, "popup-menu",
|
||||
G_CALLBACK (palette_popup), colorsel);
|
||||
|
||||
gtk_drag_dest_set (retval,
|
||||
@ -1565,9 +1559,9 @@ palette_new (GtkColorSelection *colorsel)
|
||||
targets, 1,
|
||||
GDK_ACTION_COPY);
|
||||
|
||||
g_signal_connect (retval, "drag_end",
|
||||
g_signal_connect (retval, "drag-end",
|
||||
G_CALLBACK (palette_drag_end), NULL);
|
||||
g_signal_connect (retval, "drag_data_received",
|
||||
g_signal_connect (retval, "drag-data-received",
|
||||
G_CALLBACK (palette_drop_handle), colorsel);
|
||||
|
||||
gtk_widget_set_tooltip_text (retval,
|
||||
@ -1800,10 +1794,10 @@ mouse_press (GtkWidget *invisible,
|
||||
if (event->type == GDK_BUTTON_PRESS &&
|
||||
event->button == 1)
|
||||
{
|
||||
g_signal_connect (invisible, "motion_notify_event",
|
||||
g_signal_connect (invisible, "motion-notify-event",
|
||||
G_CALLBACK (mouse_motion),
|
||||
data);
|
||||
g_signal_connect (invisible, "button_release_event",
|
||||
g_signal_connect (invisible, "button-release-event",
|
||||
G_CALLBACK (mouse_release),
|
||||
data);
|
||||
g_signal_handlers_disconnect_by_func (invisible,
|
||||
@ -1877,9 +1871,9 @@ get_screen_color (GtkWidget *button)
|
||||
priv->grab_time = time;
|
||||
priv->has_grab = TRUE;
|
||||
|
||||
g_signal_connect (priv->dropper_grab_widget, "button_press_event",
|
||||
g_signal_connect (priv->dropper_grab_widget, "button-press-event",
|
||||
G_CALLBACK (mouse_press), colorsel);
|
||||
g_signal_connect (priv->dropper_grab_widget, "key_press_event",
|
||||
g_signal_connect (priv->dropper_grab_widget, "key-press-event",
|
||||
G_CALLBACK (key_press), colorsel);
|
||||
}
|
||||
|
||||
|
||||
@ -930,16 +930,16 @@ gtk_combo_init (GtkCombo * combo)
|
||||
combo->entry_change_id = g_signal_connect (combo->entry, "changed",
|
||||
G_CALLBACK (gtk_combo_update_list),
|
||||
combo);
|
||||
g_signal_connect_after (combo->entry, "key_press_event",
|
||||
g_signal_connect_after (combo->entry, "key-press-event",
|
||||
G_CALLBACK (gtk_combo_entry_key_press), combo);
|
||||
g_signal_connect_after (combo->entry, "focus_out_event",
|
||||
g_signal_connect_after (combo->entry, "focus-out-event",
|
||||
G_CALLBACK (gtk_combo_entry_focus_out), combo);
|
||||
combo->activate_id = g_signal_connect (combo->entry, "activate",
|
||||
G_CALLBACK (gtk_combo_activate),
|
||||
combo);
|
||||
g_signal_connect (combo->button, "button_press_event",
|
||||
g_signal_connect (combo->button, "button-press-event",
|
||||
G_CALLBACK (gtk_combo_popup_button_press), combo);
|
||||
g_signal_connect (combo->button, "leave_notify_event",
|
||||
g_signal_connect (combo->button, "leave-notify-event",
|
||||
G_CALLBACK (gtk_combo_popup_button_leave), combo);
|
||||
|
||||
combo->popwin = gtk_window_new (GTK_WINDOW_POPUP);
|
||||
@ -948,7 +948,7 @@ gtk_combo_init (GtkCombo * combo)
|
||||
g_object_ref (combo->popwin);
|
||||
gtk_window_set_resizable (GTK_WINDOW (combo->popwin), FALSE);
|
||||
|
||||
g_signal_connect (combo->popwin, "key_press_event",
|
||||
g_signal_connect (combo->popwin, "key-press-event",
|
||||
G_CALLBACK (gtk_combo_window_key_press), combo);
|
||||
|
||||
gtk_widget_set_events (combo->popwin, GDK_KEY_PRESS_MASK);
|
||||
@ -990,17 +990,17 @@ gtk_combo_init (GtkCombo * combo)
|
||||
combo->list_change_id = g_signal_connect (combo->list, "selection-changed",
|
||||
G_CALLBACK (gtk_combo_selection_changed), combo);
|
||||
|
||||
g_signal_connect (combo->popwin, "key_press_event",
|
||||
g_signal_connect (combo->popwin, "key-press-event",
|
||||
G_CALLBACK (gtk_combo_list_key_press), combo);
|
||||
g_signal_connect (combo->popwin, "button_press_event",
|
||||
g_signal_connect (combo->popwin, "button-press-event",
|
||||
G_CALLBACK (gtk_combo_button_press), combo);
|
||||
|
||||
g_signal_connect (combo->popwin, "event_after",
|
||||
g_signal_connect (combo->popwin, "event-after",
|
||||
G_CALLBACK (gtk_combo_button_event_after), combo);
|
||||
g_signal_connect (combo->list, "event_after",
|
||||
g_signal_connect (combo->list, "event-after",
|
||||
G_CALLBACK (gtk_combo_button_event_after), combo);
|
||||
|
||||
g_signal_connect (combo->list, "enter_notify_event",
|
||||
g_signal_connect (combo->list, "enter-notify-event",
|
||||
G_CALLBACK (gtk_combo_list_enter), combo);
|
||||
}
|
||||
|
||||
@ -1123,7 +1123,9 @@ gtk_combo_set_popdown_strings (GtkCombo *combo,
|
||||
}
|
||||
|
||||
void
|
||||
gtk_combo_set_item_string (GtkCombo * combo, GtkItem * item, const gchar * item_value)
|
||||
gtk_combo_set_item_string (GtkCombo *combo,
|
||||
GtkItem *item,
|
||||
const gchar *item_value)
|
||||
{
|
||||
g_return_if_fail (GTK_IS_COMBO (combo));
|
||||
g_return_if_fail (item != NULL);
|
||||
@ -1154,7 +1156,7 @@ gtk_combo_size_allocate (GtkWidget *widget,
|
||||
}
|
||||
|
||||
void
|
||||
gtk_combo_disable_activate (GtkCombo* combo)
|
||||
gtk_combo_disable_activate (GtkCombo *combo)
|
||||
{
|
||||
g_return_if_fail (GTK_IS_COMBO (combo));
|
||||
|
||||
@ -1165,10 +1167,10 @@ gtk_combo_disable_activate (GtkCombo* combo)
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_combo_set_property (GObject *object,
|
||||
guint prop_id,
|
||||
const GValue *value,
|
||||
GParamSpec *pspec)
|
||||
gtk_combo_set_property (GObject *object,
|
||||
guint prop_id,
|
||||
const GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
GtkCombo *combo = GTK_COMBO (object);
|
||||
|
||||
@ -1197,10 +1199,10 @@ gtk_combo_set_property (GObject *object,
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_combo_get_property (GObject *object,
|
||||
guint prop_id,
|
||||
GValue *value,
|
||||
GParamSpec *pspec)
|
||||
gtk_combo_get_property (GObject *object,
|
||||
guint prop_id,
|
||||
GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
GtkCombo *combo = GTK_COMBO (object);
|
||||
|
||||
|
||||
@ -2801,10 +2801,10 @@ gtk_combo_box_menu_setup (GtkComboBox *combo_box,
|
||||
gtk_widget_show_all (priv->button);
|
||||
}
|
||||
|
||||
g_signal_connect (priv->button, "button_press_event",
|
||||
g_signal_connect (priv->button, "button-press-event",
|
||||
G_CALLBACK (gtk_combo_box_menu_button_press),
|
||||
combo_box);
|
||||
g_signal_connect (priv->button, "state_changed",
|
||||
g_signal_connect (priv->button, "state-changed",
|
||||
G_CALLBACK (gtk_combo_box_button_state_changed),
|
||||
combo_box);
|
||||
|
||||
@ -2812,7 +2812,7 @@ gtk_combo_box_menu_setup (GtkComboBox *combo_box,
|
||||
menu = gtk_menu_new ();
|
||||
gtk_widget_set_name (menu, "gtk-combobox-popup-menu");
|
||||
|
||||
g_signal_connect (menu, "key_press_event",
|
||||
g_signal_connect (menu, "key-press-event",
|
||||
G_CALLBACK (gtk_combo_box_menu_key_press), combo_box);
|
||||
gtk_combo_box_set_popup_widget (combo_box, menu);
|
||||
|
||||
@ -3617,7 +3617,7 @@ gtk_combo_box_list_setup (GtkComboBox *combo_box)
|
||||
priv->button = gtk_toggle_button_new ();
|
||||
gtk_widget_set_parent (priv->button,
|
||||
GTK_BIN (combo_box)->child->parent);
|
||||
g_signal_connect (priv->button, "button_press_event",
|
||||
g_signal_connect (priv->button, "button-press-event",
|
||||
G_CALLBACK (gtk_combo_box_list_button_pressed), combo_box);
|
||||
g_signal_connect (priv->button, "toggled",
|
||||
G_CALLBACK (gtk_combo_box_button_toggled), combo_box);
|
||||
@ -3654,7 +3654,7 @@ gtk_combo_box_list_setup (GtkComboBox *combo_box)
|
||||
gtk_container_add (GTK_CONTAINER (priv->cell_view_frame), priv->box);
|
||||
gtk_widget_show_all (priv->cell_view_frame);
|
||||
|
||||
g_signal_connect (priv->box, "button_press_event",
|
||||
g_signal_connect (priv->box, "button-press-event",
|
||||
G_CALLBACK (gtk_combo_box_list_button_pressed),
|
||||
combo_box);
|
||||
}
|
||||
@ -3697,22 +3697,22 @@ gtk_combo_box_list_setup (GtkComboBox *combo_box)
|
||||
/* set sample/popup widgets */
|
||||
gtk_combo_box_set_popup_widget (combo_box, priv->tree_view);
|
||||
|
||||
g_signal_connect (priv->tree_view, "key_press_event",
|
||||
g_signal_connect (priv->tree_view, "key-press-event",
|
||||
G_CALLBACK (gtk_combo_box_list_key_press),
|
||||
combo_box);
|
||||
g_signal_connect (priv->tree_view, "enter_notify_event",
|
||||
g_signal_connect (priv->tree_view, "enter-notify-event",
|
||||
G_CALLBACK (gtk_combo_box_list_enter_notify),
|
||||
combo_box);
|
||||
g_signal_connect (priv->tree_view, "row_expanded",
|
||||
g_signal_connect (priv->tree_view, "row-expanded",
|
||||
G_CALLBACK (gtk_combo_box_model_row_expanded),
|
||||
combo_box);
|
||||
g_signal_connect (priv->tree_view, "row_collapsed",
|
||||
g_signal_connect (priv->tree_view, "row-collapsed",
|
||||
G_CALLBACK (gtk_combo_box_model_row_expanded),
|
||||
combo_box);
|
||||
g_signal_connect (priv->popup_window, "button_press_event",
|
||||
g_signal_connect (priv->popup_window, "button-press-event",
|
||||
G_CALLBACK (gtk_combo_box_list_button_pressed),
|
||||
combo_box);
|
||||
g_signal_connect (priv->popup_window, "button_release_event",
|
||||
g_signal_connect (priv->popup_window, "button-release-event",
|
||||
G_CALLBACK (gtk_combo_box_list_button_released),
|
||||
combo_box);
|
||||
|
||||
@ -4972,19 +4972,19 @@ gtk_combo_box_set_model (GtkComboBox *combo_box,
|
||||
g_object_ref (combo_box->priv->model);
|
||||
|
||||
combo_box->priv->inserted_id =
|
||||
g_signal_connect (combo_box->priv->model, "row_inserted",
|
||||
g_signal_connect (combo_box->priv->model, "row-inserted",
|
||||
G_CALLBACK (gtk_combo_box_model_row_inserted),
|
||||
combo_box);
|
||||
combo_box->priv->deleted_id =
|
||||
g_signal_connect (combo_box->priv->model, "row_deleted",
|
||||
g_signal_connect (combo_box->priv->model, "row-deleted",
|
||||
G_CALLBACK (gtk_combo_box_model_row_deleted),
|
||||
combo_box);
|
||||
combo_box->priv->reordered_id =
|
||||
g_signal_connect (combo_box->priv->model, "rows_reordered",
|
||||
g_signal_connect (combo_box->priv->model, "rows-reordered",
|
||||
G_CALLBACK (gtk_combo_box_model_rows_reordered),
|
||||
combo_box);
|
||||
combo_box->priv->changed_id =
|
||||
g_signal_connect (combo_box->priv->model, "row_changed",
|
||||
g_signal_connect (combo_box->priv->model, "row-changed",
|
||||
G_CALLBACK (gtk_combo_box_model_row_changed),
|
||||
combo_box);
|
||||
|
||||
@ -5502,7 +5502,7 @@ gtk_combo_box_start_editing (GtkCellEditable *cell_editable,
|
||||
|
||||
if (combo_box->priv->cell_view)
|
||||
{
|
||||
g_signal_connect_object (combo_box->priv->button, "key_press_event",
|
||||
g_signal_connect_object (combo_box->priv->button, "key-press-event",
|
||||
G_CALLBACK (gtk_cell_editable_key_press),
|
||||
cell_editable, 0);
|
||||
|
||||
@ -5510,7 +5510,7 @@ gtk_combo_box_start_editing (GtkCellEditable *cell_editable,
|
||||
}
|
||||
else
|
||||
{
|
||||
g_signal_connect_object (GTK_BIN (combo_box)->child, "key_press_event",
|
||||
g_signal_connect_object (GTK_BIN (combo_box)->child, "key-press-event",
|
||||
G_CALLBACK (gtk_cell_editable_key_press),
|
||||
cell_editable, 0);
|
||||
|
||||
|
||||
@ -373,7 +373,7 @@ gtk_drag_highlight (GtkWidget *widget)
|
||||
{
|
||||
g_return_if_fail (GTK_IS_WIDGET (widget));
|
||||
|
||||
g_signal_connect_after (widget, "expose_event",
|
||||
g_signal_connect_after (widget, "expose-event",
|
||||
G_CALLBACK (gtk_drag_highlight_expose),
|
||||
NULL);
|
||||
|
||||
@ -495,7 +495,7 @@ gtk_drag_dest_set (GtkWidget *widget,
|
||||
|
||||
g_signal_connect (widget, "realize",
|
||||
G_CALLBACK (gtk_drag_dest_realized), site);
|
||||
g_signal_connect (widget, "hierarchy_changed",
|
||||
g_signal_connect (widget, "hierarchy-changed",
|
||||
G_CALLBACK (gtk_drag_dest_hierarchy_changed), site);
|
||||
|
||||
g_object_set_data_full (G_OBJECT (widget), I_("gtk-drag-dest"),
|
||||
@ -1248,13 +1248,13 @@ gtk_drag_source_set (GtkWidget *widget,
|
||||
|
||||
site->icon_type = GTK_IMAGE_EMPTY;
|
||||
|
||||
g_signal_connect (widget, "button_press_event",
|
||||
g_signal_connect (widget, "button-press-event",
|
||||
G_CALLBACK (gtk_drag_source_event_cb),
|
||||
site);
|
||||
g_signal_connect (widget, "button_release_event",
|
||||
g_signal_connect (widget, "button-release-event",
|
||||
G_CALLBACK (gtk_drag_source_event_cb),
|
||||
site);
|
||||
g_signal_connect (widget, "motion_notify_event",
|
||||
g_signal_connect (widget, "motion-notify-event",
|
||||
G_CALLBACK (gtk_drag_source_event_cb),
|
||||
site);
|
||||
|
||||
|
||||
30
gtk/gtkdnd.c
30
gtk/gtkdnd.c
@ -841,7 +841,7 @@ gtk_drag_get_data (GtkWidget *widget,
|
||||
g_object_ref (context);
|
||||
g_object_ref (widget);
|
||||
|
||||
g_signal_connect (selection_widget, "selection_received",
|
||||
g_signal_connect (selection_widget, "selection-received",
|
||||
G_CALLBACK (gtk_drag_selection_received), widget);
|
||||
|
||||
g_object_set_data (G_OBJECT (selection_widget), I_("drag-context"), context);
|
||||
@ -931,7 +931,7 @@ gtk_drag_finish (GdkDragContext *context,
|
||||
g_object_ref (context);
|
||||
|
||||
g_object_set_data (G_OBJECT (selection_widget), I_("drag-context"), context);
|
||||
g_signal_connect (selection_widget, "selection_received",
|
||||
g_signal_connect (selection_widget, "selection-received",
|
||||
G_CALLBACK (gtk_drag_selection_received),
|
||||
NULL);
|
||||
|
||||
@ -1011,7 +1011,7 @@ gtk_drag_highlight (GtkWidget *widget)
|
||||
{
|
||||
g_return_if_fail (GTK_IS_WIDGET (widget));
|
||||
|
||||
g_signal_connect_after (widget, "expose_event",
|
||||
g_signal_connect_after (widget, "expose-event",
|
||||
G_CALLBACK (gtk_drag_highlight_expose),
|
||||
NULL);
|
||||
|
||||
@ -1065,7 +1065,7 @@ gtk_drag_dest_set_internal (GtkWidget *widget,
|
||||
|
||||
g_signal_connect (widget, "realize",
|
||||
G_CALLBACK (gtk_drag_dest_realized), site);
|
||||
g_signal_connect (widget, "hierarchy_changed",
|
||||
g_signal_connect (widget, "hierarchy-changed",
|
||||
G_CALLBACK (gtk_drag_dest_hierarchy_changed), site);
|
||||
|
||||
g_object_set_data_full (G_OBJECT (widget), I_("gtk-drag-dest"),
|
||||
@ -1830,7 +1830,7 @@ gtk_drag_proxy_begin (GtkWidget *widget,
|
||||
source_info->proxy_dest = dest_info;
|
||||
|
||||
g_signal_connect (ipc_widget,
|
||||
"selection_get",
|
||||
"selection-get",
|
||||
G_CALLBACK (gtk_drag_selection_get),
|
||||
source_info);
|
||||
|
||||
@ -2350,19 +2350,19 @@ gtk_drag_begin_internal (GtkWidget *widget,
|
||||
info->start_x = info->cur_x;
|
||||
info->start_y = info->cur_y;
|
||||
|
||||
g_signal_connect (info->ipc_widget, "grab_broken_event",
|
||||
g_signal_connect (info->ipc_widget, "grab-broken-event",
|
||||
G_CALLBACK (gtk_drag_grab_broken_event_cb), info);
|
||||
g_signal_connect (info->ipc_widget, "grab_notify",
|
||||
g_signal_connect (info->ipc_widget, "grab-notify",
|
||||
G_CALLBACK (gtk_drag_grab_notify_cb), info);
|
||||
g_signal_connect (info->ipc_widget, "button_release_event",
|
||||
g_signal_connect (info->ipc_widget, "button-release-event",
|
||||
G_CALLBACK (gtk_drag_button_release_cb), info);
|
||||
g_signal_connect (info->ipc_widget, "motion_notify_event",
|
||||
g_signal_connect (info->ipc_widget, "motion-notify-event",
|
||||
G_CALLBACK (gtk_drag_motion_cb), info);
|
||||
g_signal_connect (info->ipc_widget, "key_press_event",
|
||||
g_signal_connect (info->ipc_widget, "key-press-event",
|
||||
G_CALLBACK (gtk_drag_key_cb), info);
|
||||
g_signal_connect (info->ipc_widget, "key_release_event",
|
||||
g_signal_connect (info->ipc_widget, "key-release-event",
|
||||
G_CALLBACK (gtk_drag_key_cb), info);
|
||||
g_signal_connect (info->ipc_widget, "selection_get",
|
||||
g_signal_connect (info->ipc_widget, "selection-get",
|
||||
G_CALLBACK (gtk_drag_selection_get), info);
|
||||
|
||||
info->have_grab = TRUE;
|
||||
@ -2443,13 +2443,13 @@ gtk_drag_source_set (GtkWidget *widget,
|
||||
|
||||
site->icon_type = GTK_IMAGE_EMPTY;
|
||||
|
||||
g_signal_connect (widget, "button_press_event",
|
||||
g_signal_connect (widget, "button-press-event",
|
||||
G_CALLBACK (gtk_drag_source_event_cb),
|
||||
site);
|
||||
g_signal_connect (widget, "button_release_event",
|
||||
g_signal_connect (widget, "button-release-event",
|
||||
G_CALLBACK (gtk_drag_source_event_cb),
|
||||
site);
|
||||
g_signal_connect (widget, "motion_notify_event",
|
||||
g_signal_connect (widget, "motion-notify-event",
|
||||
G_CALLBACK (gtk_drag_source_event_cb),
|
||||
site);
|
||||
|
||||
|
||||
@ -1176,11 +1176,11 @@ gtk_entry_init (GtkEntry *entry)
|
||||
|
||||
g_signal_connect (entry->im_context, "commit",
|
||||
G_CALLBACK (gtk_entry_commit_cb), entry);
|
||||
g_signal_connect (entry->im_context, "preedit_changed",
|
||||
g_signal_connect (entry->im_context, "preedit-changed",
|
||||
G_CALLBACK (gtk_entry_preedit_changed_cb), entry);
|
||||
g_signal_connect (entry->im_context, "retrieve_surrounding",
|
||||
g_signal_connect (entry->im_context, "retrieve-surrounding",
|
||||
G_CALLBACK (gtk_entry_retrieve_surrounding_cb), entry);
|
||||
g_signal_connect (entry->im_context, "delete_surrounding",
|
||||
g_signal_connect (entry->im_context, "delete-surrounding",
|
||||
G_CALLBACK (gtk_entry_delete_surrounding_cb), entry);
|
||||
}
|
||||
|
||||
@ -2178,7 +2178,7 @@ gtk_entry_focus_in (GtkWidget *widget,
|
||||
}
|
||||
|
||||
g_signal_connect (gdk_keymap_get_for_display (gtk_widget_get_display (widget)),
|
||||
"direction_changed",
|
||||
"direction-changed",
|
||||
G_CALLBACK (gtk_entry_keymap_direction_changed), entry);
|
||||
|
||||
gtk_entry_reset_blink_time (entry);
|
||||
@ -2490,7 +2490,7 @@ gtk_entry_start_editing (GtkCellEditable *cell_editable,
|
||||
|
||||
g_signal_connect (cell_editable, "activate",
|
||||
G_CALLBACK (gtk_cell_editable_entry_activated), NULL);
|
||||
g_signal_connect (cell_editable, "key_press_event",
|
||||
g_signal_connect (cell_editable, "key-press-event",
|
||||
G_CALLBACK (gtk_cell_editable_key_press_event), NULL);
|
||||
}
|
||||
|
||||
@ -4569,11 +4569,11 @@ gtk_entry_set_visibility (GtkEntry *entry,
|
||||
|
||||
g_signal_connect (entry->im_context, "commit",
|
||||
G_CALLBACK (gtk_entry_commit_cb), entry);
|
||||
g_signal_connect (entry->im_context, "preedit_changed",
|
||||
g_signal_connect (entry->im_context, "preedit-changed",
|
||||
G_CALLBACK (gtk_entry_preedit_changed_cb), entry);
|
||||
g_signal_connect (entry->im_context, "retrieve_surrounding",
|
||||
g_signal_connect (entry->im_context, "retrieve-surrounding",
|
||||
G_CALLBACK (gtk_entry_retrieve_surrounding_cb), entry);
|
||||
g_signal_connect (entry->im_context, "delete_surrounding",
|
||||
g_signal_connect (entry->im_context, "delete-surrounding",
|
||||
G_CALLBACK (gtk_entry_delete_surrounding_cb), entry);
|
||||
|
||||
if (GTK_WIDGET_HAS_FOCUS (entry) && visible)
|
||||
@ -6293,20 +6293,20 @@ connect_completion_signals (GtkEntry *entry,
|
||||
completion->priv->changed_id =
|
||||
g_signal_connect (entry, "changed",
|
||||
G_CALLBACK (gtk_entry_completion_changed), completion);
|
||||
g_signal_connect (entry, "key_press_event",
|
||||
g_signal_connect (entry, "key-press-event",
|
||||
G_CALLBACK (gtk_entry_completion_key_press), completion);
|
||||
}
|
||||
|
||||
if (completion->priv->inline_completion)
|
||||
{
|
||||
completion->priv->insert_text_id =
|
||||
g_signal_connect (entry, "insert_text",
|
||||
g_signal_connect (entry, "insert-text",
|
||||
G_CALLBACK (completion_insert_text_callback), completion);
|
||||
g_signal_connect (entry, "notify",
|
||||
G_CALLBACK (clear_completion_callback), completion);
|
||||
g_signal_connect (entry, "activate",
|
||||
G_CALLBACK (accept_completion_callback), completion);
|
||||
g_signal_connect (entry, "focus_out_event",
|
||||
g_signal_connect (entry, "focus-out-event",
|
||||
G_CALLBACK (accept_completion_callback), completion);
|
||||
}
|
||||
|
||||
|
||||
@ -438,13 +438,13 @@ gtk_entry_completion_init (GtkEntryCompletion *completion)
|
||||
priv->filter_model = NULL;
|
||||
|
||||
priv->tree_view = gtk_tree_view_new ();
|
||||
g_signal_connect (priv->tree_view, "button_press_event",
|
||||
g_signal_connect (priv->tree_view, "button-press-event",
|
||||
G_CALLBACK (gtk_entry_completion_list_button_press),
|
||||
completion);
|
||||
g_signal_connect (priv->tree_view, "enter_notify_event",
|
||||
g_signal_connect (priv->tree_view, "enter-notify-event",
|
||||
G_CALLBACK (gtk_entry_completion_list_enter_notify),
|
||||
completion);
|
||||
g_signal_connect (priv->tree_view, "motion_notify_event",
|
||||
g_signal_connect (priv->tree_view, "motion-notify-event",
|
||||
G_CALLBACK (gtk_entry_completion_list_motion_notify),
|
||||
completion);
|
||||
|
||||
@ -478,13 +478,13 @@ gtk_entry_completion_init (GtkEntryCompletion *completion)
|
||||
priv->action_view =
|
||||
gtk_tree_view_new_with_model (GTK_TREE_MODEL (priv->actions));
|
||||
g_object_ref_sink (priv->action_view);
|
||||
g_signal_connect (priv->action_view, "button_press_event",
|
||||
g_signal_connect (priv->action_view, "button-press-event",
|
||||
G_CALLBACK (gtk_entry_completion_action_button_press),
|
||||
completion);
|
||||
g_signal_connect (priv->action_view, "enter_notify_event",
|
||||
g_signal_connect (priv->action_view, "enter-notify-event",
|
||||
G_CALLBACK (gtk_entry_completion_list_enter_notify),
|
||||
completion);
|
||||
g_signal_connect (priv->action_view, "motion_notify_event",
|
||||
g_signal_connect (priv->action_view, "motion-notify-event",
|
||||
G_CALLBACK (gtk_entry_completion_list_motion_notify),
|
||||
completion);
|
||||
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->action_view), FALSE);
|
||||
@ -505,14 +505,15 @@ gtk_entry_completion_init (GtkEntryCompletion *completion)
|
||||
/* pack it all */
|
||||
priv->popup_window = gtk_window_new (GTK_WINDOW_POPUP);
|
||||
gtk_window_set_resizable (GTK_WINDOW (priv->popup_window), FALSE);
|
||||
gtk_window_set_type_hint(GTK_WINDOW(priv->popup_window), GDK_WINDOW_TYPE_HINT_COMBO);
|
||||
g_signal_connect (priv->popup_window, "key_press_event",
|
||||
gtk_window_set_type_hint (GTK_WINDOW(priv->popup_window),
|
||||
GDK_WINDOW_TYPE_HINT_COMBO);
|
||||
g_signal_connect (priv->popup_window, "key-press-event",
|
||||
G_CALLBACK (gtk_entry_completion_popup_key_event),
|
||||
completion);
|
||||
g_signal_connect (priv->popup_window, "key_release_event",
|
||||
g_signal_connect (priv->popup_window, "key-release-event",
|
||||
G_CALLBACK (gtk_entry_completion_popup_key_event),
|
||||
completion);
|
||||
g_signal_connect (priv->popup_window, "button_press_event",
|
||||
g_signal_connect (priv->popup_window, "button-press-event",
|
||||
G_CALLBACK (gtk_entry_completion_popup_button_press),
|
||||
completion);
|
||||
|
||||
|
||||
@ -674,7 +674,7 @@ gtk_file_chooser_button_constructor (GType type,
|
||||
g_free (current_folder);
|
||||
}
|
||||
|
||||
g_signal_connect (priv->dialog, "delete_event",
|
||||
g_signal_connect (priv->dialog, "delete-event",
|
||||
G_CALLBACK (dialog_delete_event_cb), object);
|
||||
g_signal_connect (priv->dialog, "response",
|
||||
G_CALLBACK (dialog_response_cb), object);
|
||||
|
||||
@ -3851,11 +3851,11 @@ shortcuts_list_create (GtkFileChooserDefault *impl)
|
||||
#ifdef PROFILE_FILE_CHOOSER
|
||||
g_object_set_data (G_OBJECT (impl->browse_shortcuts_tree_view), "fmq-name", "shortcuts");
|
||||
#endif
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event",
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "key-press-event",
|
||||
G_CALLBACK (tree_view_keybinding_cb), impl);
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "popup_menu",
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "popup-menu",
|
||||
G_CALLBACK (shortcuts_popup_menu_cb), impl);
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "button_press_event",
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "button-press-event",
|
||||
G_CALLBACK (shortcuts_button_press_event_cb), impl);
|
||||
/* Accessible object name for the file chooser's shortcuts pane */
|
||||
atk_object_set_name (gtk_widget_get_accessible (impl->browse_shortcuts_tree_view), _("Places"));
|
||||
@ -3884,23 +3884,23 @@ shortcuts_list_create (GtkFileChooserDefault *impl)
|
||||
g_signal_connect (selection, "changed",
|
||||
G_CALLBACK (shortcuts_selection_changed_cb), impl);
|
||||
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event",
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "key-press-event",
|
||||
G_CALLBACK (shortcuts_key_press_event_cb), impl);
|
||||
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "drag_begin",
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "drag-begin",
|
||||
G_CALLBACK (shortcuts_drag_begin_cb), impl);
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "drag_end",
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "drag-end",
|
||||
G_CALLBACK (shortcuts_drag_end_cb), impl);
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "drag_data_delete",
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "drag-data-delete",
|
||||
G_CALLBACK (shortcuts_drag_data_delete_cb), impl);
|
||||
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "drag_leave",
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "drag-leave",
|
||||
G_CALLBACK (shortcuts_drag_leave_cb), impl);
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "drag_motion",
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "drag-motion",
|
||||
G_CALLBACK (shortcuts_drag_motion_cb), impl);
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "drag_drop",
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "drag-drop",
|
||||
G_CALLBACK (shortcuts_drag_drop_cb), impl);
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "drag_data_received",
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "drag-data-received",
|
||||
G_CALLBACK (shortcuts_drag_data_received_cb), impl);
|
||||
|
||||
/* Support tooltips */
|
||||
@ -4527,20 +4527,20 @@ create_file_list (GtkFileChooserDefault *impl)
|
||||
GDK_ACTION_COPY | GDK_ACTION_MOVE);
|
||||
gtk_drag_dest_add_uri_targets (impl->browse_files_tree_view);
|
||||
|
||||
g_signal_connect (impl->browse_files_tree_view, "row_activated",
|
||||
g_signal_connect (impl->browse_files_tree_view, "row-activated",
|
||||
G_CALLBACK (list_row_activated), impl);
|
||||
g_signal_connect (impl->browse_files_tree_view, "key_press_event",
|
||||
g_signal_connect (impl->browse_files_tree_view, "key-press-event",
|
||||
G_CALLBACK (trap_activate_cb), impl);
|
||||
g_signal_connect (impl->browse_files_tree_view, "popup_menu",
|
||||
g_signal_connect (impl->browse_files_tree_view, "popup-menu",
|
||||
G_CALLBACK (list_popup_menu_cb), impl);
|
||||
g_signal_connect (impl->browse_files_tree_view, "button_press_event",
|
||||
g_signal_connect (impl->browse_files_tree_view, "button-press-event",
|
||||
G_CALLBACK (list_button_press_event_cb), impl);
|
||||
|
||||
g_signal_connect (impl->browse_files_tree_view, "drag_data_received",
|
||||
g_signal_connect (impl->browse_files_tree_view, "drag-data-received",
|
||||
G_CALLBACK (file_list_drag_data_received_cb), impl);
|
||||
g_signal_connect (impl->browse_files_tree_view, "drag_drop",
|
||||
g_signal_connect (impl->browse_files_tree_view, "drag-drop",
|
||||
G_CALLBACK (file_list_drag_drop_cb), impl);
|
||||
g_signal_connect (impl->browse_files_tree_view, "drag_motion",
|
||||
g_signal_connect (impl->browse_files_tree_view, "drag-motion",
|
||||
G_CALLBACK (file_list_drag_motion_cb), impl);
|
||||
|
||||
g_object_set (impl->browse_files_tree_view, "has-tooltip", TRUE, NULL);
|
||||
@ -4579,7 +4579,7 @@ create_file_list (GtkFileChooserDefault *impl)
|
||||
NULL);
|
||||
g_signal_connect (impl->list_name_renderer, "edited",
|
||||
G_CALLBACK (renderer_edited_cb), impl);
|
||||
g_signal_connect (impl->list_name_renderer, "editing_canceled",
|
||||
g_signal_connect (impl->list_name_renderer, "editing-canceled",
|
||||
G_CALLBACK (renderer_editing_canceled_cb), impl);
|
||||
gtk_tree_view_column_pack_start (impl->list_name_column, impl->list_name_renderer, TRUE);
|
||||
gtk_tree_view_column_set_cell_data_func (impl->list_name_column, impl->list_name_renderer,
|
||||
@ -5738,7 +5738,8 @@ gtk_file_chooser_default_hierarchy_changed (GtkWidget *widget,
|
||||
if (previous_toplevel)
|
||||
{
|
||||
g_assert (impl->toplevel_set_focus_id != 0);
|
||||
g_signal_handler_disconnect (previous_toplevel, impl->toplevel_set_focus_id);
|
||||
g_signal_handler_disconnect (previous_toplevel,
|
||||
impl->toplevel_set_focus_id);
|
||||
impl->toplevel_set_focus_id = 0;
|
||||
impl->toplevel_last_focus_widget = NULL;
|
||||
}
|
||||
@ -5748,7 +5749,7 @@ gtk_file_chooser_default_hierarchy_changed (GtkWidget *widget,
|
||||
toplevel = gtk_widget_get_toplevel (widget);
|
||||
if (GTK_IS_WINDOW (toplevel))
|
||||
{
|
||||
impl->toplevel_set_focus_id = g_signal_connect (toplevel, "set_focus",
|
||||
impl->toplevel_set_focus_id = g_signal_connect (toplevel, "set-focus",
|
||||
G_CALLBACK (toplevel_set_focus_cb), impl);
|
||||
impl->toplevel_last_focus_widget = gtk_window_get_focus (GTK_WINDOW (toplevel));
|
||||
}
|
||||
@ -6228,7 +6229,7 @@ load_set_model (GtkFileChooserDefault *impl)
|
||||
impl->list_sort_ascending = TRUE;
|
||||
profile_msg (" gtk_tree_model_sort_new_with_model end", NULL);
|
||||
|
||||
g_signal_connect (impl->sort_model, "sort_column_changed",
|
||||
g_signal_connect (impl->sort_model, "sort-column-changed",
|
||||
G_CALLBACK (list_sort_column_changed_cb), impl);
|
||||
|
||||
profile_msg (" gtk_tree_view_set_model start", NULL);
|
||||
|
||||
@ -211,16 +211,16 @@ _gtk_file_chooser_entry_init (GtkFileChooserEntry *chooser_entry)
|
||||
cell,
|
||||
"text", 0);
|
||||
|
||||
g_signal_connect (comp, "match_selected",
|
||||
g_signal_connect (comp, "match-selected",
|
||||
G_CALLBACK (match_selected_callback), chooser_entry);
|
||||
|
||||
gtk_entry_set_completion (GTK_ENTRY (chooser_entry), comp);
|
||||
g_object_unref (comp);
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
g_signal_connect (chooser_entry, "insert_text",
|
||||
g_signal_connect (chooser_entry, "insert-text",
|
||||
G_CALLBACK (insert_text_callback), NULL);
|
||||
g_signal_connect (chooser_entry, "delete_text",
|
||||
g_signal_connect (chooser_entry, "delete-text",
|
||||
G_CALLBACK (delete_text_callback), NULL);
|
||||
#endif
|
||||
}
|
||||
@ -923,7 +923,7 @@ create_completion_feedback_window (GtkFileChooserEntry *chooser_entry)
|
||||
gtk_container_add (GTK_CONTAINER (chooser_entry->completion_feedback_window), alignment);
|
||||
gtk_widget_show (alignment);
|
||||
|
||||
g_signal_connect (chooser_entry->completion_feedback_window, "expose_event",
|
||||
g_signal_connect (chooser_entry->completion_feedback_window, "expose-event",
|
||||
G_CALLBACK (completion_feedback_window_expose_event_cb), chooser_entry);
|
||||
g_signal_connect (chooser_entry->completion_feedback_window, "realize",
|
||||
G_CALLBACK (completion_feedback_window_realize_cb), chooser_entry);
|
||||
|
||||
@ -321,7 +321,7 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
|
||||
g_signal_connect (fontsel->size_entry, "activate",
|
||||
G_CALLBACK (gtk_font_selection_size_activate),
|
||||
fontsel);
|
||||
g_signal_connect_after (fontsel->size_entry, "focus_out_event",
|
||||
g_signal_connect_after (fontsel->size_entry, "focus-out-event",
|
||||
G_CALLBACK (gtk_font_selection_size_focus_out),
|
||||
fontsel);
|
||||
|
||||
@ -354,7 +354,7 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
|
||||
fontsel->family_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
|
||||
g_object_unref (model);
|
||||
|
||||
g_signal_connect (fontsel->family_list, "row_activated",
|
||||
g_signal_connect (fontsel->family_list, "row-activated",
|
||||
G_CALLBACK (list_row_activated), fontsel);
|
||||
|
||||
column = gtk_tree_view_column_new_with_attributes ("Family",
|
||||
|
||||
@ -741,7 +741,7 @@ gtk_input_dialog_fill_keys(GtkInputDialog *inputd, GdkDevice *info)
|
||||
gtk_box_pack_start (GTK_BOX (hbox), key->entry, TRUE, TRUE, 0);
|
||||
gtk_widget_show (key->entry);
|
||||
|
||||
g_signal_connect (key->entry, "key_press_event",
|
||||
g_signal_connect (key->entry, "key-press-event",
|
||||
G_CALLBACK (gtk_input_dialog_key_press), key);
|
||||
g_signal_connect (key->entry, "destroy",
|
||||
G_CALLBACK (gtk_input_dialog_destroy_key), key);
|
||||
|
||||
@ -398,7 +398,7 @@ gtk_menu_tool_button_init (GtkMenuToolButton *button)
|
||||
|
||||
g_signal_connect (arrow_button, "toggled",
|
||||
G_CALLBACK (arrow_button_toggled_cb), button);
|
||||
g_signal_connect (arrow_button, "button_press_event",
|
||||
g_signal_connect (arrow_button, "button-press-event",
|
||||
G_CALLBACK (arrow_button_button_press_event_cb), button);
|
||||
}
|
||||
|
||||
|
||||
@ -153,7 +153,8 @@ get_slider_button (GtkPathBar *path_bar,
|
||||
atk_object_set_name (atk_obj, _("Down Path"));
|
||||
|
||||
gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
|
||||
gtk_container_add (GTK_CONTAINER (button), gtk_arrow_new (arrow_type, GTK_SHADOW_OUT));
|
||||
gtk_container_add (GTK_CONTAINER (button),
|
||||
gtk_arrow_new (arrow_type, GTK_SHADOW_OUT));
|
||||
gtk_container_add (GTK_CONTAINER (path_bar), button);
|
||||
gtk_widget_show_all (button);
|
||||
|
||||
@ -178,16 +179,24 @@ gtk_path_bar_init (GtkPathBar *path_bar)
|
||||
path_bar->down_slider_button = get_slider_button (path_bar, GTK_ARROW_RIGHT);
|
||||
path_bar->icon_size = FALLBACK_ICON_SIZE;
|
||||
|
||||
g_signal_connect_swapped (path_bar->up_slider_button, "clicked", G_CALLBACK (gtk_path_bar_scroll_up), path_bar);
|
||||
g_signal_connect_swapped (path_bar->down_slider_button, "clicked", G_CALLBACK (gtk_path_bar_scroll_down), path_bar);
|
||||
g_signal_connect_swapped (path_bar->up_slider_button, "clicked",
|
||||
G_CALLBACK (gtk_path_bar_scroll_up), path_bar);
|
||||
g_signal_connect_swapped (path_bar->down_slider_button, "clicked",
|
||||
G_CALLBACK (gtk_path_bar_scroll_down), path_bar);
|
||||
|
||||
g_signal_connect (path_bar->up_slider_button, "focus_out_event", G_CALLBACK (gtk_path_bar_slider_up_defocus), path_bar);
|
||||
g_signal_connect (path_bar->down_slider_button, "focus_out_event", G_CALLBACK (gtk_path_bar_slider_down_defocus), path_bar);
|
||||
g_signal_connect (path_bar->up_slider_button, "focus-out-event",
|
||||
G_CALLBACK (gtk_path_bar_slider_up_defocus), path_bar);
|
||||
g_signal_connect (path_bar->down_slider_button, "focus-out-event",
|
||||
G_CALLBACK (gtk_path_bar_slider_down_defocus), path_bar);
|
||||
|
||||
g_signal_connect (path_bar->up_slider_button, "button_press_event", G_CALLBACK (gtk_path_bar_slider_button_press), path_bar);
|
||||
g_signal_connect (path_bar->up_slider_button, "button_release_event", G_CALLBACK (gtk_path_bar_slider_button_release), path_bar);
|
||||
g_signal_connect (path_bar->down_slider_button, "button_press_event", G_CALLBACK (gtk_path_bar_slider_button_press), path_bar);
|
||||
g_signal_connect (path_bar->down_slider_button, "button_release_event", G_CALLBACK (gtk_path_bar_slider_button_release), path_bar);
|
||||
g_signal_connect (path_bar->up_slider_button, "button-press-event",
|
||||
G_CALLBACK (gtk_path_bar_slider_button_press), path_bar);
|
||||
g_signal_connect (path_bar->up_slider_button, "button-release-event",
|
||||
G_CALLBACK (gtk_path_bar_slider_button_release), path_bar);
|
||||
g_signal_connect (path_bar->down_slider_button, "button-press-event",
|
||||
G_CALLBACK (gtk_path_bar_slider_button_press), path_bar);
|
||||
g_signal_connect (path_bar->down_slider_button, "button-release-event",
|
||||
G_CALLBACK (gtk_path_bar_slider_button_release), path_bar);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -1510,7 +1519,7 @@ make_directory_button (GtkPathBar *path_bar,
|
||||
NULL, 0,
|
||||
GDK_ACTION_COPY);
|
||||
gtk_drag_source_add_uri_targets (button_data->button);
|
||||
g_signal_connect (button_data->button, "drag_data_get",
|
||||
g_signal_connect (button_data->button, "drag-data-get",
|
||||
G_CALLBACK (button_drag_data_get_cb), button_data);
|
||||
|
||||
return button_data;
|
||||
|
||||
@ -144,9 +144,9 @@ gtk_tooltip_init (GtkTooltip *tooltip)
|
||||
gtk_container_add (GTK_CONTAINER (tooltip->window), tooltip->alignment);
|
||||
gtk_widget_show (tooltip->alignment);
|
||||
|
||||
g_signal_connect_swapped (tooltip->window, "style_set",
|
||||
g_signal_connect_swapped (tooltip->window, "style-set",
|
||||
G_CALLBACK (gtk_tooltip_window_style_set), tooltip);
|
||||
g_signal_connect_swapped (tooltip->window, "expose_event",
|
||||
g_signal_connect_swapped (tooltip->window, "expose-event",
|
||||
G_CALLBACK (gtk_tooltip_paint_window), tooltip);
|
||||
|
||||
tooltip->box = gtk_hbox_new (FALSE, tooltip->window->style->xthickness);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user