diff --git a/ChangeLog b/ChangeLog index 909e23b081..161a2a7d92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +Thu Jun 20 15:36:40 2002 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_owner_set): Get + the owner from the display if !NULL. Otherwise, warn for + multihead. (#85680) + +Thu Jun 20 15:17:14 2002 Owen Taylor + + * gtk/gtkstyle.[ch]: Get rid of gtk_style_get_font_for_display(), + make gtk_style_get_font() warn for multihead if called + on an unattached style. (#80277) + + * gtk/gtktext.c: Remove use of gtk_style_get_font_for_display(); + this makes gtktext not multihead safe, but it doesn't matter; + it's ENABLE_BROKEN anyways. + + * gtk/gtkmain.c gtk/gtkdebug.h: Add GTK_NOTE(MULTIHEAD,[]) + +Thu Jun 20 14:51:30 2002 Owen Taylor + + * gtk/gtksettings.c (gtk_settings_notify): Only + change the double click time if the screen for + the notification is screen 0 of the display. + (#77978) + + * gdk/gdkevents.c (gdk_display_set_double_click_time): Fix + half-done rename. + Thu Jun 20 12:16:00 2002 Owen Taylor * gtk/gtkinvisible.c (gtk_invisible_set_screen): Add diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 909e23b081..161a2a7d92 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,31 @@ +Thu Jun 20 15:36:40 2002 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_owner_set): Get + the owner from the display if !NULL. Otherwise, warn for + multihead. (#85680) + +Thu Jun 20 15:17:14 2002 Owen Taylor + + * gtk/gtkstyle.[ch]: Get rid of gtk_style_get_font_for_display(), + make gtk_style_get_font() warn for multihead if called + on an unattached style. (#80277) + + * gtk/gtktext.c: Remove use of gtk_style_get_font_for_display(); + this makes gtktext not multihead safe, but it doesn't matter; + it's ENABLE_BROKEN anyways. + + * gtk/gtkmain.c gtk/gtkdebug.h: Add GTK_NOTE(MULTIHEAD,[]) + +Thu Jun 20 14:51:30 2002 Owen Taylor + + * gtk/gtksettings.c (gtk_settings_notify): Only + change the double click time if the screen for + the notification is screen 0 of the display. + (#77978) + + * gdk/gdkevents.c (gdk_display_set_double_click_time): Fix + half-done rename. + Thu Jun 20 12:16:00 2002 Owen Taylor * gtk/gtkinvisible.c (gtk_invisible_set_screen): Add diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 909e23b081..161a2a7d92 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,31 @@ +Thu Jun 20 15:36:40 2002 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_owner_set): Get + the owner from the display if !NULL. Otherwise, warn for + multihead. (#85680) + +Thu Jun 20 15:17:14 2002 Owen Taylor + + * gtk/gtkstyle.[ch]: Get rid of gtk_style_get_font_for_display(), + make gtk_style_get_font() warn for multihead if called + on an unattached style. (#80277) + + * gtk/gtktext.c: Remove use of gtk_style_get_font_for_display(); + this makes gtktext not multihead safe, but it doesn't matter; + it's ENABLE_BROKEN anyways. + + * gtk/gtkmain.c gtk/gtkdebug.h: Add GTK_NOTE(MULTIHEAD,[]) + +Thu Jun 20 14:51:30 2002 Owen Taylor + + * gtk/gtksettings.c (gtk_settings_notify): Only + change the double click time if the screen for + the notification is screen 0 of the display. + (#77978) + + * gdk/gdkevents.c (gdk_display_set_double_click_time): Fix + half-done rename. + Thu Jun 20 12:16:00 2002 Owen Taylor * gtk/gtkinvisible.c (gtk_invisible_set_screen): Add diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 909e23b081..161a2a7d92 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,31 @@ +Thu Jun 20 15:36:40 2002 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_owner_set): Get + the owner from the display if !NULL. Otherwise, warn for + multihead. (#85680) + +Thu Jun 20 15:17:14 2002 Owen Taylor + + * gtk/gtkstyle.[ch]: Get rid of gtk_style_get_font_for_display(), + make gtk_style_get_font() warn for multihead if called + on an unattached style. (#80277) + + * gtk/gtktext.c: Remove use of gtk_style_get_font_for_display(); + this makes gtktext not multihead safe, but it doesn't matter; + it's ENABLE_BROKEN anyways. + + * gtk/gtkmain.c gtk/gtkdebug.h: Add GTK_NOTE(MULTIHEAD,[]) + +Thu Jun 20 14:51:30 2002 Owen Taylor + + * gtk/gtksettings.c (gtk_settings_notify): Only + change the double click time if the screen for + the notification is screen 0 of the display. + (#77978) + + * gdk/gdkevents.c (gdk_display_set_double_click_time): Fix + half-done rename. + Thu Jun 20 12:16:00 2002 Owen Taylor * gtk/gtkinvisible.c (gtk_invisible_set_screen): Add diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 909e23b081..161a2a7d92 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,31 @@ +Thu Jun 20 15:36:40 2002 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_owner_set): Get + the owner from the display if !NULL. Otherwise, warn for + multihead. (#85680) + +Thu Jun 20 15:17:14 2002 Owen Taylor + + * gtk/gtkstyle.[ch]: Get rid of gtk_style_get_font_for_display(), + make gtk_style_get_font() warn for multihead if called + on an unattached style. (#80277) + + * gtk/gtktext.c: Remove use of gtk_style_get_font_for_display(); + this makes gtktext not multihead safe, but it doesn't matter; + it's ENABLE_BROKEN anyways. + + * gtk/gtkmain.c gtk/gtkdebug.h: Add GTK_NOTE(MULTIHEAD,[]) + +Thu Jun 20 14:51:30 2002 Owen Taylor + + * gtk/gtksettings.c (gtk_settings_notify): Only + change the double click time if the screen for + the notification is screen 0 of the display. + (#77978) + + * gdk/gdkevents.c (gdk_display_set_double_click_time): Fix + half-done rename. + Thu Jun 20 12:16:00 2002 Owen Taylor * gtk/gtkinvisible.c (gtk_invisible_set_screen): Add diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 909e23b081..161a2a7d92 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,31 @@ +Thu Jun 20 15:36:40 2002 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_owner_set): Get + the owner from the display if !NULL. Otherwise, warn for + multihead. (#85680) + +Thu Jun 20 15:17:14 2002 Owen Taylor + + * gtk/gtkstyle.[ch]: Get rid of gtk_style_get_font_for_display(), + make gtk_style_get_font() warn for multihead if called + on an unattached style. (#80277) + + * gtk/gtktext.c: Remove use of gtk_style_get_font_for_display(); + this makes gtktext not multihead safe, but it doesn't matter; + it's ENABLE_BROKEN anyways. + + * gtk/gtkmain.c gtk/gtkdebug.h: Add GTK_NOTE(MULTIHEAD,[]) + +Thu Jun 20 14:51:30 2002 Owen Taylor + + * gtk/gtksettings.c (gtk_settings_notify): Only + change the double click time if the screen for + the notification is screen 0 of the display. + (#77978) + + * gdk/gdkevents.c (gdk_display_set_double_click_time): Fix + half-done rename. + Thu Jun 20 12:16:00 2002 Owen Taylor * gtk/gtkinvisible.c (gtk_invisible_set_screen): Add diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 76dad02cea..6078d5c8a3 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -408,12 +408,22 @@ gtk_selection_owner_set (GtkWidget *widget, GdkAtom selection, guint32 time) { - g_return_val_if_fail (widget == NULL || GTK_WIDGET_REALIZED (widget), FALSE); + GdkDisplay *display; - return gtk_selection_owner_set_for_display (gdk_get_default_display(), - widget, - selection, - time); + g_return_val_if_fail (widget == NULL || GTK_WIDGET_REALIZED (widget), FALSE); + + if (widget) + display = gtk_widget_get_display (widget); + else + { + GTK_NOTE (MULTIHEAD, + g_warning ("gtk_selection_owner_set (NULL,...) is not multihead safe")); + + display = gdk_get_default_display (); + } + + return gtk_selection_owner_set_for_display (display, widget, + selection, time); } /*************************************************************