[gtk+] clipboard: Use gdk_display_get_last_seen_time
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] clipboard: Use gdk_display_get_last_seen_time
- Date: Fri, 17 Nov 2017 20:41:43 +0000 (UTC)
commit 4865c3273a5063e1c0d6e52fe731d7bba7d06323
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Nov 17 15:40:49 2017 -0500
clipboard: Use gdk_display_get_last_seen_time
This removes the backend dependent code from gtkclipboard.c.
A good thing!
gtk/gtkclipboard.c | 41 ++---------------------------------------
1 files changed, 2 insertions(+), 39 deletions(-)
---
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index 4421779..2e77764 100644
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -30,18 +30,7 @@
#include "gtktextbufferrichtext.h"
#include "gtkintl.h"
-#ifdef GDK_WINDOWING_X11
-#include "x11/gdkx.h"
-#endif
-
-#ifdef GDK_WINDOWING_BROADWAY
-#include "broadway/gdkbroadway.h"
-#endif
-
-#ifdef GDK_WINDOWING_WIN32
-#include "win32/gdkwin32.h"
-#endif
-
+#include "gdk/gdk-private.h"
/**
* SECTION:gtkclipboard
@@ -473,37 +462,11 @@ get_clipboard_widget (GdkDisplay *display)
static guint32
clipboard_get_timestamp (GtkClipboard *clipboard)
{
- GtkWidget *clipboard_widget = get_clipboard_widget (clipboard->display);
guint32 timestamp = gtk_get_current_event_time ();
- GdkWindow *window;
if (timestamp == GDK_CURRENT_TIME)
{
- window = gtk_widget_get_window (clipboard_widget);
-#ifdef GDK_WINDOWING_X11
- if (GDK_IS_X11_WINDOW (window))
- {
- timestamp = gdk_x11_get_server_time (gtk_widget_get_window (clipboard_widget));
- }
- else
-#endif
-#if defined GDK_WINDOWING_WIN32
- if (GDK_IS_WIN32_WINDOW (window))
- {
- timestamp = GetMessageTime ();
- }
- else
-#endif
-#if defined GDK_WINDOWING_BROADWAY
- if (GDK_IS_BROADWAY_WINDOW (window))
- {
- timestamp = gdk_broadway_get_last_seen_time (window);
- }
- else
-#endif
- {
- /* No implementation */
- }
+ timestamp = gdk_display_get_last_seen_time (clipboard->display);
}
else
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]