Remove deprecated code from GdkEvent

diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt
index 3148da685cc7c0694c1c439f4bc584f1be7ac5af..0bcc942f9876c8618a318d08bbae156bbb07ece4 100644 (file)
--- a/docs/reference/gdk/gdk-sections.txt
+++ b/docs/reference/gdk/gdk-sections.txt
@@ -1086,7 +1086,6 @@ GDK_PRIORITY_REDRAW
 gdk_events_pending
 gdk_event_peek
 gdk_event_get
-gdk_event_get_graphics_expose
 gdk_event_put
 gdk_event_new
 gdk_event_copy

diff --git a/docs/reference/gdk/tmpl/events.sgml b/docs/reference/gdk/tmpl/events.sgml
index 9174b9db0ddde3b26c0f41f0fded569a86ad4e99..efb9e3e8738298d933fe3cd260974fe11e691cf8 100644 (file)
--- a/docs/reference/gdk/tmpl/events.sgml
+++ b/docs/reference/gdk/tmpl/events.sgml
@@ -182,14 +182,6 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_event_get_graphics_expose ##### -->
-<para>
-</para>
-
-@window: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_event_put ##### -->
 <para>
 </para>

diff --git a/gdk/directfb/gdkevents-directfb.c b/gdk/directfb/gdkevents-directfb.c
index 2dd5000e02ed163a7a6349b3753db8e85c49e361..7260547bcba913586e40fa01001a5c5d69de85b6 100644 (file)
--- a/gdk/directfb/gdkevents-directfb.c
+++ b/gdk/directfb/gdkevents-directfb.c
@@ -318,36 +318,6 @@ gdk_events_pending (void)
   return _gdk_event_queue_find_first (display) ? TRUE : FALSE;
 }
 
-GdkEvent *
-gdk_event_get_graphics_expose (GdkWindow *window)
-{
-  GdkDisplay *display;
-  GList      *list;
-
-  g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
-
-  display = gdk_drawable_get_display (GDK_DRAWABLE (window));
-
-  for (list = _gdk_event_queue_find_first (display); list; list = list->next)
-    {
-      GdkEvent *event = list->data;
-      if (event->type == GDK_EXPOSE && event->expose.window == window)
-        break;
-    }
-
-  if (list)
-    {
-      GdkEvent *retval = list->data;
-
-      _gdk_event_queue_remove_link (display, list);
-      g_list_free_1 (list);
-
-      return retval;
-    }
-
-  return NULL;
-}
-
 void
 _gdk_events_queue (GdkDisplay *display)
 {

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 93637663545fe996dcefd164ae9b50ef11708861..9043ce3f3e2b041d3b47ab97e866a6fc752bb20e 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -22,9 +22,6 @@
 #if IN_HEADER(__GDK_EVENTS_H__)
 #if IN_FILE(__GDK_EVENTS_X11_C__)
 gdk_add_client_message_filter
-#ifndef GDK_DISABLE_DEPRECATED
-gdk_event_get_graphics_expose
-#endif
 gdk_events_pending
 #endif
 #endif

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 089b4e77732b6ec96ef70386b2513b05730428f7..6152202f00c44ba691c806ef03e729d9d4171d22 100644 (file)
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -511,7 +511,7 @@ gdk_event_copy (const GdkEvent *event)
  * Frees a #GdkEvent, freeing or decrementing any resources associated with it.
  * Note that this function should only be called with events returned from
  * functions such as gdk_event_peek(), gdk_event_get(),
- * gdk_event_get_graphics_expose() and gdk_event_copy() and gdk_event_new().
+ * gdk_event_get_graphics_expose(), gdk_event_copy() and gdk_event_new().
  **/
 void
 gdk_event_free (GdkEvent *event)

diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index e6c516c780711021ee2ad26e494ee6d8a7392f91..43d1f4538ec3efb6cd3208de3cb56934223a881e 100644 (file)
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -519,9 +519,6 @@ gboolean  gdk_events_pending                (void);
 GdkEvent* gdk_event_get                        (void);
 
 GdkEvent* gdk_event_peek                (void);
-#ifndef GDK_DISABLE_DEPRECATED
-GdkEvent* gdk_event_get_graphics_expose (GdkWindow     *window);
-#endif
 void      gdk_event_put                        (const GdkEvent *event);
 
 GdkEvent* gdk_event_new                 (GdkEventType    type);

diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index 1a0b67846b4a258532af51291181d58323c68036..24b9dd578ebb7058af7801a7c298431d4090bb56 100644 (file)
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -68,13 +68,6 @@ gdk_events_pending (void)
          (_gdk_quartz_event_loop_check_pending ()));
 }
 
-GdkEvent*
-gdk_event_get_graphics_expose (GdkWindow *window)
-{
-  /* FIXME: Implement */
-  return NULL;
-}
-
 GdkGrabStatus
 gdk_keyboard_grab (GdkWindow  *window,
                   gint        owner_events,

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 3773e4dc2074764479e29dcbbb604f99ee22ff6f..219da60b03ff57e5fad1255b36171d3d3c8274b8 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -402,30 +402,6 @@ gdk_events_pending (void)
           PeekMessageW (&msg, NULL, 0, 0, PM_NOREMOVE)));
 }
 
-GdkEvent*
-gdk_event_get_graphics_expose (GdkWindow *window)
-{
-  MSG msg;
-  GdkEvent *event = NULL;
-
-  g_return_val_if_fail (window != NULL, NULL);
-  
-  GDK_NOTE (EVENTS, g_print ("gdk_event_get_graphics_expose\n"));
-
-  if (PeekMessageW (&msg, GDK_WINDOW_HWND (window), WM_PAINT, WM_PAINT, PM_REMOVE))
-    {
-      handle_wm_paint (&msg, window, TRUE, &event);
-      if (event != NULL)
-       {
-         GDK_NOTE (EVENTS, g_print ("gdk_event_get_graphics_expose: got it!\n"));
-         return event;
-       }
-    }
-  
-  GDK_NOTE (EVENTS, g_print ("gdk_event_get_graphics_expose: nope\n"));
-  return NULL; 
-}
-
 #if 0 /* Unused, but might be useful to re-introduce in some debugging output? */
 
 static char *

diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 1f27497f3fb75c8f52eedc743245864852b0c816..d1dbacaa5b747f812dd609187e056328dab5b6de 100644 (file)
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -295,44 +295,6 @@ graphics_expose_predicate (Display  *display,
     return False;
 }
 
-/**
- * gdk_event_get_graphics_expose:
- * @window: the #GdkWindow to wait for the events for.
- * 
- * Waits for a GraphicsExpose or NoExpose event from the X server.
- * This is used in the #GtkText and #GtkCList widgets in GTK+ to make sure any
- * GraphicsExpose events are handled before the widget is scrolled.
- *
- * Return value:  a #GdkEventExpose if a GraphicsExpose was received, or %NULL if a
- * NoExpose event was received.
- *
- * Deprecated: 2.18:
- **/
-GdkEvent*
-gdk_event_get_graphics_expose (GdkWindow *window)
-{
-  XEvent xevent;
-  GdkEvent *event;
-  
-  g_return_val_if_fail (window != NULL, NULL);
-
-  XIfEvent (GDK_WINDOW_XDISPLAY (window), &xevent, 
-           graphics_expose_predicate, (XPointer) window);
-  
-  if (xevent.xany.type == GraphicsExpose)
-    {
-      event = gdk_event_new (GDK_NOTHING);
-      
-      if (gdk_event_translate (GDK_WINDOW_DISPLAY (window), event,
-                              &xevent, TRUE))
-       return event;
-      else
-       gdk_event_free (event);
-    }
-  
-  return NULL; 
-}
-
 static gint
 gdk_event_apply_filters (XEvent *xevent,
                         GdkEvent *event,