From cfaed624be94bb6fc636269ec9d044ca99170a3c Mon Sep 17 00:00:00 2001 From: John Ralls Date: Tue, 1 Feb 2011 13:53:00 -0800 Subject: [PATCH] Update quartz to reflect deletion of GdkNativeWindow and client_message functions. --- gdk/quartz/gdkdisplay-quartz.c | 4 ---- gdk/quartz/gdkdnd-quartz.c | 10 ---------- gdk/quartz/gdkevents-quartz.c | 19 ------------------- gdk/quartz/gdkprivate-quartz.h | 20 -------------------- gdk/quartz/gdkselection-quartz.c | 11 ----------- 5 files changed, 64 deletions(-) diff --git a/gdk/quartz/gdkdisplay-quartz.c b/gdk/quartz/gdkdisplay-quartz.c index 357c3c0b54..d8ad2a567f 100644 --- a/gdk/quartz/gdkdisplay-quartz.c +++ b/gdk/quartz/gdkdisplay-quartz.c @@ -342,9 +342,6 @@ gdk_quartz_display_class_init (GdkQuartzDisplayClass *class) display_class->supports_input_shapes = gdk_quartz_display_supports_input_shapes; display_class->supports_composite = gdk_quartz_display_supports_composite; display_class->list_devices = gdk_quartz_display_list_devices; - display_class->send_client_message = _gdk_quartz_display_send_client_message; - display_class->add_client_message_filter = _gdk_quartz_display_add_client_message_filter; - display_class->get_drag_protocol = _gdk_quartz_display_get_drag_protocol; display_class->get_cursor_for_type = _gdk_quartz_display_get_cursor_for_type; display_class->get_cursor_for_name = _gdk_quartz_display_get_cursor_for_name; display_class->get_cursor_for_pixbuf = _gdk_quartz_display_get_cursor_for_pixbuf; @@ -363,7 +360,6 @@ gdk_quartz_display_class_init (GdkQuartzDisplayClass *class) display_class->get_keymap = _gdk_quartz_display_get_keymap; display_class->get_selection_owner = _gdk_quartz_display_get_selection_owner; display_class->set_selection_owner = _gdk_quartz_display_set_selection_owner; - display_class->send_selection_notify = _gdk_quartz_display_send_selection_notify; display_class->get_selection_property = _gdk_quartz_display_get_selection_property; display_class->convert_selection = _gdk_quartz_display_convert_selection; display_class->text_property_to_utf8_list = _gdk_quartz_display_text_property_to_utf8_list; diff --git a/gdk/quartz/gdkdnd-quartz.c b/gdk/quartz/gdkdnd-quartz.c index 7ba1705c54..83c16ef97c 100644 --- a/gdk/quartz/gdkdnd-quartz.c +++ b/gdk/quartz/gdkdnd-quartz.c @@ -65,16 +65,6 @@ gdk_quartz_drag_context_drag_motion (GdkDragContext *context, return FALSE; } -GdkNativeWindow -_gdk_quartz_display_get_drag_protocol (GdkDisplay *display, - GdkNativeWindow xid, - GdkDragProtocol *protocol, - guint *version) -{ - /* FIXME: Implement */ - return 0; -} - static GdkWindow * gdk_quartz_drag_context_find_window (GdkDragContext *context, GdkWindow *drag_window, diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c index 348dff1954..c611c0a106 100644 --- a/gdk/quartz/gdkevents-quartz.c +++ b/gdk/quartz/gdkevents-quartz.c @@ -1331,25 +1331,6 @@ _gdk_quartz_display_queue_events (GdkDisplay *display) } } -void -_gdk_quartz_display_add_client_message_filter (GdkDisplay *display, - GdkAtom message_type, - GdkFilterFunc func, - gpointer data) -{ - /* Not supported. */ -} - - -gboolean -_gdk_quartz_display_send_client_message (GdkDisplay *display, - GdkEvent *event, - GdkNativeWindow winid) -{ - /* Not supported. */ - return FALSE; -} - void _gdk_quartz_screen_broadcast_client_message (GdkScreen *screen, GdkEvent *event) diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h index 44f186a425..6a05e2501b 100644 --- a/gdk/quartz/gdkprivate-quartz.h +++ b/gdk/quartz/gdkprivate-quartz.h @@ -95,14 +95,6 @@ void _gdk_quartz_display_event_data_copy (GdkDisplay *display, void _gdk_quartz_display_event_data_free (GdkDisplay *display, GdkEvent *event); -gboolean _gdk_quartz_display_send_client_message (GdkDisplay *display, - GdkEvent *event, - GdkNativeWindow winid); -void _gdk_quartz_display_add_client_message_filter (GdkDisplay *display, - GdkAtom message_type, - GdkFilterFunc func, - gpointer data); - /* Display methods - cursor */ GdkCursor *_gdk_quartz_display_get_cursor_for_type (GdkDisplay *display, GdkCursorType type); @@ -135,12 +127,6 @@ void _gdk_quartz_display_create_window_impl (GdkDisplay *display, /* Display methods - keymap */ GdkKeymap * _gdk_quartz_display_get_keymap (GdkDisplay *display); -/* Display methods - Drag and Drop */ -GdkNativeWindow _gdk_quartz_display_get_drag_protocol (GdkDisplay *display, - GdkNativeWindow xid, - GdkDragProtocol *protocol, - guint *version); - /* Display methods - selection */ gboolean _gdk_quartz_display_set_selection_owner (GdkDisplay *display, GdkWindow *owner, @@ -149,12 +135,6 @@ gboolean _gdk_quartz_display_set_selection_owner (GdkDisplay *display, gboolean send_event); GdkWindow * _gdk_quartz_display_get_selection_owner (GdkDisplay *display, GdkAtom selection); -void _gdk_quartz_display_send_selection_notify (GdkDisplay *display, - GdkNativeWindow requestor, - GdkAtom selection, - GdkAtom target, - GdkAtom property, - guint32 time); gint _gdk_quartz_display_get_selection_property (GdkDisplay *display, GdkWindow *requestor, guchar **data, diff --git a/gdk/quartz/gdkselection-quartz.c b/gdk/quartz/gdkselection-quartz.c index 446a23e48f..566448e2b9 100644 --- a/gdk/quartz/gdkselection-quartz.c +++ b/gdk/quartz/gdkselection-quartz.c @@ -65,17 +65,6 @@ _gdk_quartz_display_get_selection_property (GdkDisplay *display, return 0; } -void -_gdk_quartz_display_send_selection_notify (GdkDisplay *display, - GdkNativeWindow requestor, - GdkAtom selection, - GdkAtom target, - GdkAtom property, - guint32 time) -{ - /* FIXME: Implement */ -} - gchar * _gdk_quartz_display_utf8_to_string_target (GdkDisplay *display, const gchar *str)