diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-02-26 14:07:19 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-02-26 14:11:16 -0500 |
| commit | b4ae491b4577e0b451991d932a30aef6c0d01ffc (patch) | |
| tree | 38001705a5c49a4e0ff48294f9079066e5e38541 | |
| parent | 1469d01e2e688bab6fec1ee75bf760ea102a2ad6 (diff) | |
| download | gtk+-b4ae491b4577e0b451991d932a30aef6c0d01ffc.tar.gz | |
window: Undo the deprection of gtk_window_present
After considerable discussion, we came to the conclusion
that the convenience of this API wins over the correctness
of gtk_window_present_with_time(), in particular since we
don't have a good mechanism to carry timestamps from the
events to the places where we present windows.
| -rw-r--r-- | gtk/gtkwindow.c | 14 | ||||
| -rw-r--r-- | gtk/gtkwindow.h | 2 |
2 files changed, 2 insertions, 14 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index c5b55ffd71..ae36f5f092 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -8739,8 +8739,6 @@ gtk_window_snapshot (GtkWidget *widget, * Presents a window to the user. This function should not be used * as when it is called, it is too late to gather a valid timestamp * to allow focus stealing prevention to work correctly. - * - * Deprecated: 4.0: Use gtk_window_present_with_time() instead. **/ void gtk_window_present (GtkWindow *window) @@ -8780,7 +8778,6 @@ gtk_window_present_with_time (GtkWindow *window, GtkWindowPrivate *priv = gtk_window_get_instance_private (window); GtkWidget *widget; GdkSurface *surface; - static gsize warned_current_time = FALSE; g_return_if_fail (GTK_IS_WINDOW (window)); @@ -8797,17 +8794,8 @@ gtk_window_present_with_time (GtkWindow *window, /* Translate a timestamp of GDK_CURRENT_TIME appropriately */ if (timestamp == GDK_CURRENT_TIME) { - if (g_once_init_enter (&warned_current_time)) - { - gboolean warned = TRUE; - g_warning ("gtk_window_present_with_time() should not be called with 0, or " - "GDK_CURRENT_TIME as a timestamp, the timestamp should instead be " - "gathered at the time the user initiated the request for the window " - "to be shown"); - g_once_init_leave (&warned_current_time, warned); - } #ifdef GDK_WINDOWING_X11 - if (GDK_IS_X11_SURFACE(surface)) + if (GDK_IS_X11_SURFACE (surface)) { GdkDisplay *display; diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h index c21d5261c4..fb30ab99b8 100644 --- a/gtk/gtkwindow.h +++ b/gtk/gtkwindow.h @@ -324,7 +324,7 @@ GDK_AVAILABLE_IN_ALL gboolean gtk_window_propagate_key_event (GtkWindow *window, GdkEventKey *event); -GDK_DEPRECATED_IN_4_0_FOR(gtk_window_present_with_time) +GDK_AVAILABLE_IN_ALL void gtk_window_present (GtkWindow *window); GDK_AVAILABLE_IN_ALL void gtk_window_present_with_time (GtkWindow *window, |