Updated for gtk+-1.3.9

diff --git a/gdk/gdk.lisp b/gdk/gdk.lisp
index a2bdf7fc5ed309af727bae6b1e766a57ad3434ca..055809611f14855c5888140b43b06472d0fdb370 100644 (file)
--- 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
 
 ;; 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")
 
 
 (in-package "GDK")


@@ -23,7 +23,7 @@ (in-package "GDK")
 
 ;;; Events
 
 
 ;;; Events
 

-(defbinding event-poll-fd () int)
+(defbinding connection-number () int)

 
 (defbinding (events-pending-p "gdk_events_pending") () boolean)
 
 
 (defbinding (events-pending-p "gdk_events_pending") () boolean)
 

diff --git a/gdk/gdkevents.lisp b/gdk/gdkevents.lisp
index 5331b297891b7108a8f107871151097139fa131a..cf56074520a99837bb566dc21d158dbc721d1044 100644 (file)
--- 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
 
 ;; 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")
 
 
 (in-package "GDK")
 


@@ -49,10 +49,8 @@   (defclass event (boxed)
 
 (defmethod initialize-instance ((event event) &rest initargs)
   (declare (ignore initargs))
 
 (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)
 
 (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))))
 
      (unless (null-pointer-p location)
        (ensure-proxy-instance (%type-of-event location) location ,weak-ref))))
 

-(defbinding %event-new () pointer)
-

 
 ;;;; Metaclass for event classes
 
 
 ;;;; Metaclass for event classes
 

diff --git a/gdk/gdkglue.c b/gdk/gdkglue.c
index 89e6470164673b827448f5b49d733dd22d779a35..a50f1594e17a5f2c628946771100b00fc5e38ace 100644 (file)
--- a/gdk/gdkglue.c
+++ b/gdk/gdkglue.c
@@ -16,18 +16,18 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
  * 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>
 
 
 
 
 #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); 

 }
 
 
 }