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

widget: gtk_widget_get_clipboard => gtk_widget_get_old_clipboard

Browse Source 
Just rename the function, so the previous one can be used for the
new clipboard.
This commit is contained in:
Benjamin Otte 2017-11-25 23:20:16 +01:00
parent 6fffa5b171
commit a59572f96d
16 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/gtk-demo/clipboard.c
View File

@ -23,7 +23,7 @@ copy_button_clicked (GtkWidget *button,
entry = GTK_WIDGET (user_data);
/* Get the clipboard object */
clipboard = gtk_widget_get_clipboard (entry,
clipboard = gtk_widget_get_old_clipboard (entry,
GDK_SELECTION_CLIPBOARD);
/* Set clipboard text */
@ -54,7 +54,7 @@ paste_button_clicked (GtkWidget *button,
entry = GTK_WIDGET (user_data);
/* Get the clipboard object */
clipboard = gtk_widget_get_clipboard (entry,
clipboard = gtk_widget_get_old_clipboard (entry,
GDK_SELECTION_CLIPBOARD);
/* Request the contents of the clipboard, contents_received will be

4
demos/widget-factory/widget-factory.c
View File

@ -1235,7 +1235,7 @@ handle_cutcopypaste (GtkWidget *button, GtkWidget *textview)
GtkClipboard *clipboard;
const gchar *id;
clipboard = gtk_widget_get_clipboard (textview, GDK_SELECTION_CLIPBOARD);
clipboard = gtk_widget_get_old_clipboard (textview, GDK_SELECTION_CLIPBOARD);
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
id = gtk_buildable_get_name (GTK_BUILDABLE (button));
@ -1837,7 +1837,7 @@ activate (GApplication *app)
G_CALLBACK (textbuffer_notify_selection), widget);
widget = (GtkWidget *)gtk_builder_get_object (builder, "pastebutton");
g_signal_connect (widget, "clicked", G_CALLBACK (handle_cutcopypaste), widget2);
g_signal_connect_object (gtk_widget_get_clipboard (widget2, GDK_SELECTION_CLIPBOARD), "owner-change",
g_signal_connect_object (gtk_widget_get_old_clipboard (widget2, GDK_SELECTION_CLIPBOARD), "owner-change",
G_CALLBACK (clipboard_owner_change), widget, 0);
widget = (GtkWidget *)gtk_builder_get_object (builder, "osd_frame");

2
docs/reference/gtk/gtk4-sections.txt
View File

@ -4530,7 +4530,7 @@ gtk_widget_freeze_child_notify
gtk_widget_get_child_visible
gtk_widget_get_parent
gtk_widget_get_settings
gtk_widget_get_clipboard
gtk_widget_get_old_clipboard
gtk_widget_get_display
gtk_widget_get_size_request
gtk_widget_set_child_visible

2
examples/bp/bloatpad.c
View File

@ -96,7 +96,7 @@ change_justify_state (GSimpleAction *action,
static GtkClipboard *
get_clipboard (GtkWidget *widget)
{
return gtk_widget_get_clipboard (widget, gdk_atom_intern_static_string ("CLIPBOARD"));
return gtk_widget_get_old_clipboard (widget, gdk_atom_intern_static_string ("CLIPBOARD"));
}
static void

2
examples/plugman.c
View File

@ -41,7 +41,7 @@ change_fullscreen_state (GSimpleAction *action,
static GtkClipboard *
get_clipboard (GtkWidget *widget)
{
return gtk_widget_get_clipboard (widget, gdk_atom_intern_static_string ("CLIPBOARD"));
return gtk_widget_get_old_clipboard (widget, gdk_atom_intern_static_string ("CLIPBOARD"));
}
static void

6
gtk/a11y/gtkentryaccessible.c
View File

@ -1265,7 +1265,7 @@ gtk_entry_accessible_copy_text (AtkEditableText *text,
editable = GTK_EDITABLE (widget);
str = gtk_editable_get_chars (editable, start_pos, end_pos);
clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_CLIPBOARD);
clipboard = gtk_widget_get_old_clipboard (widget, GDK_SELECTION_CLIPBOARD);
gtk_clipboard_set_text (clipboard, str, -1);
g_free (str);
}
@ -1289,7 +1289,7 @@ gtk_entry_accessible_cut_text (AtkEditableText *text,
return;
str = gtk_editable_get_chars (editable, start_pos, end_pos);
clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_CLIPBOARD);
clipboard = gtk_widget_get_old_clipboard (widget, GDK_SELECTION_CLIPBOARD);
gtk_clipboard_set_text (clipboard, str, -1);
gtk_editable_delete_text (editable, start_pos, end_pos);
}
@ -1356,7 +1356,7 @@ gtk_entry_accessible_paste_text (AtkEditableText *text,
paste->position = position;
g_object_ref (paste->entry);
clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_CLIPBOARD);
clipboard = gtk_widget_get_old_clipboard (widget, GDK_SELECTION_CLIPBOARD);
gtk_clipboard_request_text (clipboard, paste_received_cb, paste);
}

6
gtk/a11y/gtktextviewaccessible.c
View File

@ -1612,7 +1612,7 @@ gtk_text_view_accessible_copy_text (AtkEditableText *text,
gtk_text_buffer_get_iter_at_offset (buffer, &end, end_pos);
str = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_CLIPBOARD);
clipboard = gtk_widget_get_old_clipboard (widget, GDK_SELECTION_CLIPBOARD);
gtk_clipboard_set_text (clipboard, str, -1);
}
@ -1640,7 +1640,7 @@ gtk_text_view_accessible_cut_text (AtkEditableText *text,
gtk_text_buffer_get_iter_at_offset (buffer, &start, start_pos);
gtk_text_buffer_get_iter_at_offset (buffer, &end, end_pos);
str = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_CLIPBOARD);
clipboard = gtk_widget_get_old_clipboard (widget, GDK_SELECTION_CLIPBOARD);
gtk_clipboard_set_text (clipboard, str, -1);
gtk_text_buffer_delete (buffer, &start, &end);
}
@ -1716,7 +1716,7 @@ gtk_text_view_accessible_paste_text (AtkEditableText *text,
paste.position = position;
g_object_ref (paste.buffer);
clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_CLIPBOARD);
clipboard = gtk_widget_get_old_clipboard (widget, GDK_SELECTION_CLIPBOARD);
gtk_clipboard_request_text (clipboard, paste_received, &paste);
}

6
gtk/gtkclipboard.c
View File

@ -384,7 +384,7 @@ selection_get_cb (GtkWidget *widget,
{
GtkClipboard *clipboard;
clipboard = gtk_widget_get_clipboard (widget,
clipboard = gtk_widget_get_old_clipboard (widget,
gtk_selection_data_get_selection (selection_data));
if (clipboard && clipboard->get_func)
@ -399,7 +399,7 @@ selection_clear_event_cb (GtkWidget *widget,
GtkClipboard *clipboard;
gdk_event_get_selection ((GdkEvent *)event, &selection);
clipboard = gtk_widget_get_clipboard (widget, selection);
clipboard = gtk_widget_get_old_clipboard (widget, selection);
if (clipboard)
{
@ -916,7 +916,7 @@ selection_received (GtkWidget *widget,
RequestContentsInfo *request_info = get_request_contents_info (widget);
set_request_contents_info (widget, NULL);
request_info->callback (gtk_widget_get_clipboard (widget, gtk_selection_data_get_selection (selection_data)),
request_info->callback (gtk_widget_get_old_clipboard (widget, gtk_selection_data_get_selection (selection_data)),
selection_data,
request_info->user_data);

12
gtk/gtkentry.c
View File

@ -3023,7 +3023,7 @@ gtk_entry_unrealize (GtkWidget *widget)
gtk_im_context_set_client_widget (priv->im_context, NULL);
clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_PRIMARY);
clipboard = gtk_widget_get_old_clipboard (widget, GDK_SELECTION_PRIMARY);
if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (entry))
gtk_clipboard_clear (clipboard);
@ -5117,7 +5117,7 @@ gtk_entry_copy_clipboard (GtkEntry *entry)
}
str = _gtk_entry_get_display_text (entry, start, end);
gtk_clipboard_set_text (gtk_widget_get_clipboard (GTK_WIDGET (entry),
gtk_clipboard_set_text (gtk_widget_get_old_clipboard (GTK_WIDGET (entry),
GDK_SELECTION_CLIPBOARD),
str, -1);
g_free (str);
@ -6550,7 +6550,7 @@ gtk_entry_paste (GtkEntry *entry,
GdkAtom selection)
{
g_object_ref (entry);
gtk_clipboard_request_text (gtk_widget_get_clipboard (GTK_WIDGET (entry), selection),
gtk_clipboard_request_text (gtk_widget_get_old_clipboard (GTK_WIDGET (entry), selection),
paste_received, entry);
}
@ -6593,7 +6593,7 @@ gtk_entry_update_primary_selection (GtkEntry *entry)
list = gdk_content_formats_new (NULL, 0);
list = gtk_content_formats_add_text_targets (list);
clipboard = gtk_widget_get_clipboard (GTK_WIDGET (entry), GDK_SELECTION_PRIMARY);
clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (entry), GDK_SELECTION_PRIMARY);
if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start, &end))
{
@ -8580,7 +8580,7 @@ gtk_entry_do_popup (GtkEntry *entry,
info->entry = g_object_ref (entry);
info->trigger_event = event ? gdk_event_copy (event) : gtk_get_current_event ();
gtk_clipboard_request_contents (gtk_widget_get_clipboard (GTK_WIDGET (entry), GDK_SELECTION_CLIPBOARD),
gtk_clipboard_request_contents (gtk_widget_get_old_clipboard (GTK_WIDGET (entry), GDK_SELECTION_CLIPBOARD),
gdk_atom_intern_static_string ("TARGETS"),
popup_targets_received,
info);
@ -8763,7 +8763,7 @@ gtk_entry_selection_bubble_popup_show (gpointer user_data)
{
GtkEntry *entry = user_data;
gtk_clipboard_request_contents (gtk_widget_get_clipboard (GTK_WIDGET (entry), GDK_SELECTION_CLIPBOARD),
gtk_clipboard_request_contents (gtk_widget_get_old_clipboard (GTK_WIDGET (entry), GDK_SELECTION_CLIPBOARD),
gdk_atom_intern_static_string ("TARGETS"),
bubble_targets_received,
entry);

4
gtk/gtkfilechooserwidget.c
View File

@ -1726,7 +1726,7 @@ copy_file_location_cb (GSimpleAction *action,
GtkClipboard *clipboard;
GdkContentFormats *target_list;
clipboard = gtk_widget_get_clipboard (GTK_WIDGET (impl), GDK_SELECTION_CLIPBOARD);
clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (impl), GDK_SELECTION_CLIPBOARD);
target_list = gdk_content_formats_new (NULL, 0);
target_list = gtk_content_formats_add_text_targets (target_list);
@ -6708,7 +6708,7 @@ paste_text_received (GtkClipboard *clipboard,
static void
location_popup_on_paste_handler (GtkFileChooserWidget *impl)
{
GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (impl),
GtkClipboard *clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (impl),
GDK_SELECTION_CLIPBOARD);
gtk_clipboard_request_text (clipboard,
(GtkClipboardTextReceivedFunc) paste_text_received,

6
gtk/gtklabel.c
View File

@ -5221,7 +5221,7 @@ gtk_label_select_region_index (GtkLabel *label,
priv->select_info->selection_anchor = anchor_index;
priv->select_info->selection_end = end_index;
clipboard = gtk_widget_get_clipboard (GTK_WIDGET (label),
clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (label),
GDK_SELECTION_PRIMARY);
if (anchor_index != end_index)
@ -5922,7 +5922,7 @@ gtk_label_copy_clipboard (GtkLabel *label)
if (start > len)
start = len;
clipboard = gtk_widget_get_clipboard (GTK_WIDGET (label), GDK_SELECTION_CLIPBOARD);
clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (label), GDK_SELECTION_CLIPBOARD);
if (start != end)
gtk_clipboard_set_text (clipboard, priv->text + start, end - start);
@ -6003,7 +6003,7 @@ copy_link_activate_cb (GtkMenuItem *menuitem,
GtkClipboard *clipboard;
link = g_object_get_qdata (G_OBJECT (menuitem), quark_link);
clipboard = gtk_widget_get_clipboard (GTK_WIDGET (label), GDK_SELECTION_CLIPBOARD);
clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (label), GDK_SELECTION_CLIPBOARD);
gtk_clipboard_set_text (clipboard, link->uri, -1);
}

2
gtk/gtklinkbutton.c
View File

@ -332,7 +332,7 @@ copy_activate_cb (GtkWidget *widget,
{
GtkLinkButtonPrivate *priv = link_button->priv;
gtk_clipboard_set_text (gtk_widget_get_clipboard (GTK_WIDGET (link_button),
gtk_clipboard_set_text (gtk_widget_get_old_clipboard (GTK_WIDGET (link_button),
GDK_SELECTION_CLIPBOARD),
priv->uri, -1);
}

2
gtk/gtkrecentchooserdefault.c
View File

@ -1460,7 +1460,7 @@ copy_activated_cb (GtkMenuItem *menu_item,
utf8_uri = gtk_recent_info_get_uri_display (info);
gtk_clipboard_set_text (gtk_widget_get_clipboard (GTK_WIDGET (impl),
gtk_clipboard_set_text (gtk_widget_get_old_clipboard (GTK_WIDGET (impl),
GDK_SELECTION_CLIPBOARD),
utf8_uri, -1);

20
gtk/gtktextview.c
View File

@ -1894,7 +1894,7 @@ gtk_text_view_set_buffer (GtkTextView *text_view,
if (gtk_widget_get_realized (GTK_WIDGET (text_view)))
{
GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
GtkClipboard *clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
GDK_SELECTION_PRIMARY);
gtk_text_buffer_remove_selection_clipboard (priv->buffer, clipboard);
}
@ -1948,7 +1948,7 @@ gtk_text_view_set_buffer (GtkTextView *text_view,
if (gtk_widget_get_realized (GTK_WIDGET (text_view)))
{
GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
GtkClipboard *clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
GDK_SELECTION_PRIMARY);
gtk_text_buffer_add_selection_clipboard (priv->buffer, clipboard);
}
@ -4582,7 +4582,7 @@ gtk_text_view_realize (GtkWidget *widget)
if (priv->buffer)
{
GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
GtkClipboard *clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
GDK_SELECTION_PRIMARY);
gtk_text_buffer_add_selection_clipboard (priv->buffer, clipboard);
}
@ -4602,7 +4602,7 @@ gtk_text_view_unrealize (GtkWidget *widget)
if (priv->buffer)
{
GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
GtkClipboard *clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
GDK_SELECTION_PRIMARY);
gtk_text_buffer_remove_selection_clipboard (priv->buffer, clipboard);
}
@ -5289,7 +5289,7 @@ gtk_text_view_multipress_gesture_pressed (GtkGestureMultiPress *gesture,
get_iter_from_gesture (text_view, priv->multipress_gesture,
&iter, NULL, NULL);
gtk_text_buffer_paste_clipboard (get_buffer (text_view),
gtk_widget_get_clipboard (GTK_WIDGET (text_view),
gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
GDK_SELECTION_PRIMARY),
&iter,
priv->editable);
@ -6770,7 +6770,7 @@ gtk_text_view_backspace (GtkTextView *text_view)
static void
gtk_text_view_cut_clipboard (GtkTextView *text_view)
{
GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
GtkClipboard *clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
GDK_SELECTION_CLIPBOARD);
gtk_text_buffer_cut_clipboard (get_buffer (text_view),
@ -6785,7 +6785,7 @@ gtk_text_view_cut_clipboard (GtkTextView *text_view)
static void
gtk_text_view_copy_clipboard (GtkTextView *text_view)
{
GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
GtkClipboard *clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
GDK_SELECTION_CLIPBOARD);
gtk_text_buffer_copy_clipboard (get_buffer (text_view),
@ -6797,7 +6797,7 @@ gtk_text_view_copy_clipboard (GtkTextView *text_view)
static void
gtk_text_view_paste_clipboard (GtkTextView *text_view)
{
GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
GtkClipboard *clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
GDK_SELECTION_CLIPBOARD);
gtk_text_buffer_paste_clipboard (get_buffer (text_view),
@ -8921,7 +8921,7 @@ gtk_text_view_do_popup (GtkTextView *text_view,
info->text_view = g_object_ref (text_view);
info->trigger_event = event ? gdk_event_copy (event) : gtk_get_current_event ();
gtk_clipboard_request_contents (gtk_widget_get_clipboard (GTK_WIDGET (text_view),
gtk_clipboard_request_contents (gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
GDK_SELECTION_CLIPBOARD),
gdk_atom_intern_static_string ("TARGETS"),
popup_targets_received,
@ -9111,7 +9111,7 @@ static gboolean
gtk_text_view_selection_bubble_popup_show (gpointer user_data)
{
GtkTextView *text_view = user_data;
gtk_clipboard_request_contents (gtk_widget_get_clipboard (GTK_WIDGET (text_view),
gtk_clipboard_request_contents (gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
GDK_SELECTION_CLIPBOARD),
gdk_atom_intern_static_string ("TARGETS"),
bubble_targets_received,

4
gtk/gtkwidget.c
View File

@ -12380,7 +12380,7 @@ gtk_widget_set_margin_bottom (GtkWidget *widget,
}
/**
* gtk_widget_get_clipboard:
* gtk_widget_get_old_clipboard:
* @widget: a #GtkWidget
* @selection: a #GdkAtom which identifies the clipboard
* to use. %GDK_SELECTION_CLIPBOARD gives the
@ -12401,7 +12401,7 @@ gtk_widget_set_margin_bottom (GtkWidget *widget,
* Since: 2.2
**/
GtkClipboard *
gtk_widget_get_clipboard (GtkWidget *widget, GdkAtom selection)
gtk_widget_get_old_clipboard (GtkWidget *widget, GdkAtom selection)
{
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);

2
gtk/gtkwidget.h
View File

@ -783,7 +783,7 @@ GdkDisplay * gtk_widget_get_display (GtkWidget *widget);
GDK_AVAILABLE_IN_ALL
GtkSettings* gtk_widget_get_settings (GtkWidget *widget);
GDK_AVAILABLE_IN_ALL
GtkClipboard *gtk_widget_get_clipboard (GtkWidget *widget,
GtkClipboard *gtk_widget_get_old_clipboard (GtkWidget *widget,
GdkAtom selection);