From b030f2d9b679b9b18db0356ab0f2a2086ea61939 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Tue, 19 Mar 2002 19:06:22 +0000 Subject: [PATCH] Updated for gtk 2.0 Organization: Straylight/Edgeware From: espen --- gdk/gdktypes.lisp | 6 +++--- gtk/gtkobject.lisp | 11 +++++++++-- gtk/gtktypes.lisp | 6 +++--- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp index 68be4b9..a08da2e 100644 --- a/gdk/gdktypes.lisp +++ b/gdk/gdktypes.lisp @@ -15,13 +15,13 @@ ;; 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: gdktypes.lisp,v 1.6 2002-01-20 14:14:38 espen Exp $ +;; $Id: gdktypes.lisp,v 1.7 2002-03-19 19:06:22 espen Exp $ (in-package "GDK") (eval-when (:compile-toplevel :load-toplevel :execute) - (init-types-in-library "libgdk-x11-1.3.so") - (init-types-in-library "libgdk_pixbuf-1.3.so")) + (init-types-in-library "libgdk-x11-2.0.so") + (init-types-in-library "libgdk_pixbuf-2.0.so")) (defclass color (boxed) ((pixel diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp index f50759e..1fd8f27 100644 --- a/gtk/gtkobject.lisp +++ b/gtk/gtkobject.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: gtkobject.lisp,v 1.12 2001-11-12 22:33:08 espen Exp $ +;; $Id: gtkobject.lisp,v 1.13 2002-03-19 19:09:18 espen Exp $ (in-package "GTK") @@ -34,7 +34,7 @@ (in-package "GTK") ;;;; Superclass for the gtk class hierarchy (eval-when (:compile-toplevel :load-toplevel :execute) - (init-types-in-library "libgtk-x11-1.3.so" + (init-types-in-library "libgtk-x11-2.0.so" :ignore ("gtk_window_get_type_hint")) (defclass %object (gobject) @@ -135,8 +135,15 @@ (defmethod effective-slot-definition-class ((class child-class) initargs) (:property (find-class 'effective-child-slot-definition)) (t (call-next-method)))) +(progn + (declaim (optimize (ext:inhibit-warnings 3))) + (defun %container-child-get-property (parent child pname gvalue)) + (defun %container-child-set-property (parent child pname gvalue))) + + (defmethod compute-virtual-slot-accessors ((class child-class) (slotd effective-child-slot-definition) direct-slotds) + (with-slots (type) slotd (let ((pname (slot-definition-pname (first direct-slotds))) (type-number (find-type-number type))) diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp index 85fbd1d..41d998a 100644 --- a/gtk/gtktypes.lisp +++ b/gtk/gtktypes.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: gtktypes.lisp,v 1.10 2001-12-12 20:24:41 espen Exp $ +;; $Id: gtktypes.lisp,v 1.11 2002-03-19 19:09:18 espen Exp $ (in-package "GTK") @@ -32,7 +32,7 @@ (defclass requisition (boxed) :initarg :height :type int)) (:metaclass boxed-class) - (:alien-name "GtkRequisition")) + (:alien-name "GtkTypeRequisition")) (defclass border (boxed) ((left @@ -56,7 +56,7 @@ (defclass border (boxed) :initarg :bottom :type int)) (:metaclass boxed-class) - (:alien-name "GtkBorder")) + (:alien-name "GtkTypeBorder")) (defclass adjustment (%object) ((lower -- [mdw]