From 7d56481e1f1488e8027bf955a525f0602861f2b1 Mon Sep 17 00:00:00 2001
Message-Id: <7d56481e1f1488e8027bf955a525f0602861f2b1.1716376520.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sun, 21 Oct 2001 23:02:40 +0000
Subject: [PATCH] Updated for gtk+-1.3.9
Organization: Straylight/Edgeware

From: espen <espen>

---
 gdk/gdk.lisp       |  4 ++--
 gdk/gdkevents.lisp | 10 +++-------
 gdk/gdkglue.c      |  8 ++++----
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/gdk/gdk.lisp b/gdk/gdk.lisp
index ff17315..a42f432 100644
--- a/gdk/gdk.lisp
+++ b/gdk/gdk.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gdk.lisp,v 1.6 2001-05-11 16:19:07 espen Exp $
+;; $Id: gdk.lisp,v 1.7 2001-10-21 23:02:40 espen Exp $
 
 
 (in-package "GDK")
@@ -23,7 +23,7 @@ (in-package "GDK")
 
 ;;; Events
 
-(defbinding event-poll-fd () int)
+(defbinding connection-number () int)
 
 (defbinding (events-pending-p "gdk_events_pending") () boolean)
 
diff --git a/gdk/gdkevents.lisp b/gdk/gdkevents.lisp
index b101811..f0d0c3a 100644
--- a/gdk/gdkevents.lisp
+++ b/gdk/gdkevents.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gdkevents.lisp,v 1.2 2001-05-31 12:36:39 espen Exp $
+;; $Id: gdkevents.lisp,v 1.3 2001-10-21 23:02:40 espen Exp $
 
 (in-package "GDK")
 
@@ -49,10 +49,8 @@   (defclass event (boxed)
 
 (defmethod initialize-instance ((event event) &rest initargs)
   (declare (ignore initargs))
-  (with-slots (location %type) event
-    (setf location (%event-new))
-    (setf %type (event-class-type (class-of event))))
-  (call-next-method))
+  (call-next-method)
+  (setf (slot-value event '%type) (event-class-type (class-of event))))
 
 (deftype-method translate-from-alien
     event (type-spec location &optional weak-ref)
@@ -61,8 +59,6 @@ (deftype-method translate-from-alien
      (unless (null-pointer-p location)
        (ensure-proxy-instance (%type-of-event location) location ,weak-ref))))
 
-(defbinding %event-new () pointer)
-
 
 ;;;; Metaclass for event classes
 
diff --git a/gdk/gdkglue.c b/gdk/gdkglue.c
index e17967b..72c894f 100644
--- a/gdk/gdkglue.c
+++ b/gdk/gdkglue.c
@@ -16,18 +16,18 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: gdkglue.c,v 1.1 2000-08-14 16:44:41 espen Exp $ */
+/* $Id: gdkglue.c,v 1.2 2001-10-21 23:02:40 espen Exp $ */
 
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
 
-extern GPollFD event_poll_fd;
+extern Display *gdk_display;
 
-gint gdk_event_poll_fd ()
+gint gdk_connection_number ()
 {
-  return event_poll_fd.fd;
+  return ConnectionNumber (gdk_display); 
 }
 
 
-- 
[mdw]