[broadway] Update to new GDK backend APIs

diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c
index c71118ea42d10024db084fd794b40dbb57f99932..fa89a8cfd7c44540ea44d30c63fc12a45a106fc8 100644 (file)
--- a/gdk/broadway/gdkdisplay-broadway.c
+++ b/gdk/broadway/gdkdisplay-broadway.c
@@ -712,22 +712,6 @@ gdk_broadway_display_list_devices (GdkDisplay *display)
   return GDK_BROADWAY_DISPLAY (display)->input_devices;
 }
 
-static gboolean
-gdk_broadway_display_send_client_message (GdkDisplay     *display,
-                                         GdkEvent       *event,
-                                         GdkNativeWindow winid)
-{
-  return FALSE;
-}
-
-static void
-gdk_broadway_display_add_client_message_filter (GdkDisplay   *display,
-                                               GdkAtom       message_type,
-                                               GdkFilterFunc func,
-                                               gpointer      data)
-{
-}
-
 static gulong
 gdk_broadway_display_get_next_serial (GdkDisplay *display)
 {
@@ -777,9 +761,6 @@ gdk_broadway_display_class_init (GdkBroadwayDisplayClass * class)
   display_class->supports_input_shapes = gdk_broadway_display_supports_input_shapes;
   display_class->supports_composite = gdk_broadway_display_supports_composite;
   display_class->list_devices = gdk_broadway_display_list_devices;
-  display_class->send_client_message = gdk_broadway_display_send_client_message;
-  display_class->add_client_message_filter = gdk_broadway_display_add_client_message_filter;
-  display_class->get_drag_protocol = _gdk_broadway_display_get_drag_protocol;
   display_class->get_cursor_for_type = _gdk_broadway_display_get_cursor_for_type;
   display_class->get_cursor_for_name = _gdk_broadway_display_get_cursor_for_name;
   display_class->get_cursor_for_pixbuf = _gdk_broadway_display_get_cursor_for_pixbuf;

diff --git a/gdk/broadway/gdkdnd-broadway.c b/gdk/broadway/gdkdnd-broadway.c
index b5e5850f8d1748cd4f36c14b3f8a858a7f7b78db..cf07081b89b241fea21675fda03438a97b8329b0 100644 (file)
--- a/gdk/broadway/gdkdnd-broadway.c
+++ b/gdk/broadway/gdkdnd-broadway.c
@@ -102,13 +102,11 @@ _gdk_broadway_window_drag_begin (GdkWindow *window,
   return new_context;
 }
 
-GdkNativeWindow
-_gdk_broadway_display_get_drag_protocol (GdkDisplay      *display,
-                                        GdkNativeWindow  xid,
-                                        GdkDragProtocol *protocol,
-                                        guint           *version)
+GdkDragProtocol
+_gdk_broadway_window_get_drag_protocol (GdkWindow *window,
+                                       GdkWindow **target)
 {
-  return 0;
+  return GDK_DRAG_PROTO_NONE;
 }
 
 static GdkWindow *

diff --git a/gdk/broadway/gdkprivate-broadway.h b/gdk/broadway/gdkprivate-broadway.h
index efc0f778c08703f310b1437b4e5ccbf604cb4c45..2ddba084666b5ce036945adeca30dc684f2cdb08 100644 (file)
--- a/gdk/broadway/gdkprivate-broadway.h
+++ b/gdk/broadway/gdkprivate-broadway.h
@@ -128,10 +128,8 @@ void _gdk_broadway_screen_init_visuals (GdkScreen *screen);
 void _gdk_broadway_display_init_dnd (GdkDisplay *display);
 GdkDisplay * _gdk_broadway_display_open (const gchar *display_name);
 void _gdk_broadway_display_queue_events (GdkDisplay *display);
-GdkNativeWindow _gdk_broadway_display_get_drag_protocol (GdkDisplay      *display,
-                                                        GdkNativeWindow  xid,
-                                                        GdkDragProtocol *protocol,
-                                                        guint           *version);
+GdkDragProtocol _gdk_broadway_window_get_drag_protocol (GdkWindow *window,
+                                                       GdkWindow **target);
 GdkCursor*_gdk_broadway_display_get_cursor_for_type (GdkDisplay    *display,
                                                     GdkCursorType  cursor_type);
 GdkCursor*_gdk_broadway_display_get_cursor_for_name (GdkDisplay  *display,
@@ -170,7 +168,7 @@ gint _gdk_broadway_display_get_selection_property (GdkDisplay *display,
                                                   GdkAtom    *ret_type,
                                                   gint       *ret_format);
 void _gdk_broadway_display_send_selection_notify (GdkDisplay       *display,
-                                                 GdkNativeWindow  requestor,
+                                                 GdkWindow       *requestor,
                                                  GdkAtom          selection,
                                                  GdkAtom          target,
                                                  GdkAtom          property, 

diff --git a/gdk/broadway/gdkselection-broadway.c b/gdk/broadway/gdkselection-broadway.c
index 4ff9621990a10a3b6412812286398d0b995cb7fd..15cdc9bf077d8ac843f1c47bcdbc35ec5b1b600c 100644 (file)
--- a/gdk/broadway/gdkselection-broadway.c
+++ b/gdk/broadway/gdkselection-broadway.c
@@ -113,8 +113,8 @@ _gdk_broadway_display_get_selection_property (GdkDisplay *display,
 }
 
 void
-_gdk_broadway_display_send_selection_notify (GdkDisplay       *display,
-                                            GdkNativeWindow  requestor,
+_gdk_broadway_display_send_selection_notify (GdkDisplay      *display,
+                                            GdkWindow       *requestor,
                                             GdkAtom          selection,
                                             GdkAtom          target,
                                             GdkAtom          property, 

diff --git a/gdk/broadway/gdkwindow-broadway.c b/gdk/broadway/gdkwindow-broadway.c
index 438d9535737d98adfc4dd40cf7d9261180393b44..9a909c41295ca39696bde9b7a70fcf265f2efc3a 100644 (file)
--- a/gdk/broadway/gdkwindow-broadway.c
+++ b/gdk/broadway/gdkwindow-broadway.c
@@ -1387,4 +1387,5 @@ gdk_window_impl_broadway_class_init (GdkWindowImplBroadwayClass *klass)
   impl_class->get_property = _gdk_broadway_window_get_property;
   impl_class->change_property = _gdk_broadway_window_change_property;
   impl_class->delete_property = _gdk_broadway_window_delete_property;
+  impl_class->get_drag_protocol = _gdk_broadway_window_get_drag_protocol;
 }