From 56460319be51dd9ffc1005dca03a7b145ff4734b Mon Sep 17 00:00:00 2001 Message-Id: <56460319be51dd9ffc1005dca03a7b145ff4734b.1715131971.git.mdw@distorted.org.uk> From: Mark Wooding Date: Mon, 12 Nov 2001 22:29:17 +0000 Subject: [PATCH] Removed libdir path in calls to INIT-TYPES-IN-LIBRARY Organization: Straylight/Edgeware From: espen --- gdk/gdktypes.lisp | 6 +++--- gtk/gtkobject.lisp | 7 +++---- gtk/gtktypes.lisp | 25 ++++++++++++++----------- pango/pango.lisp | 8 +++----- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp index 87e2aa3..3ffc850 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.4 2001-05-29 15:53:32 espen Exp $ +;; $Id: gdktypes.lisp,v 1.5 2001-11-12 22:29:17 espen Exp $ (in-package "GDK") (eval-when (:compile-toplevel :load-toplevel :execute) - (init-types-in-library "/opt/gnome/lib/libgdk-x11-1.3.so") - (init-types-in-library "/opt/gnome/lib/libgdk_pixbuf-1.3.so")) + (init-types-in-library "libgdk-x11-1.3.so") + (init-types-in-library "libgdk_pixbuf-1.3.so")) (defclass color (boxed) ((pixel diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp index f5e5e5d..f50759e 100644 --- a/gtk/gtkobject.lisp +++ b/gtk/gtkobject.lisp @@ -1,5 +1,5 @@ ;; Common Lisp bindings for GTK+ v2.0 -;; Copyright (C) 1999-2001 Espen S. Johnsen +;; Copyright (C) 1999-2001 Espen S. Johnsen ;; ;; This library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public @@ -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.11 2001-10-25 08:16:17 espen Exp $ +;; $Id: gtkobject.lisp,v 1.12 2001-11-12 22:33:08 espen Exp $ (in-package "GTK") @@ -34,8 +34,7 @@ (in-package "GTK") ;;;; Superclass for the gtk class hierarchy (eval-when (:compile-toplevel :load-toplevel :execute) - (init-types-in-library - "/opt/gnome/lib/libgtk-x11-1.3.so" + (init-types-in-library "libgtk-x11-1.3.so" :ignore ("gtk_window_get_type_hint")) (defclass %object (gobject) diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp index d508502..a230ad1 100644 --- a/gtk/gtktypes.lisp +++ b/gtk/gtktypes.lisp @@ -1,5 +1,5 @@ ;; Common Lisp bindings for GTK+ v2.0.x -;; Copyright (C) 1999-2001 Espen S. Johnsen +;; Copyright (C) 1999-2001 Espen S. Johnsen ;; ;; This library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public @@ -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.8 2001-10-21 23:16:31 espen Exp $ +;; $Id: gtktypes.lisp,v 1.9 2001-11-12 22:32:17 espen Exp $ (in-package "GTK") @@ -69,10 +69,8 @@ (defclass adjustment (%object) :accessor adjustment-upper :initarg :upper :type single-float) - (value + (%value ; to get the offset right :allocation :alien - :accessor adjustment-value - :initarg :value :type single-float) (step-increment :allocation :alien @@ -88,6 +86,13 @@ (defclass adjustment (%object) :allocation :alien :accessor adjustment-page-size :initarg :page-size + :type single-float) + (value + :allocation :virtual + :getter "gtk_adjustment_get_value" + :setter "gtk_adjustment_set_value" + :accessor adjustment-value + :initarg :value :type single-float)) (:metaclass gobject-class) (:alien-name "GtkAdjustment")) @@ -102,10 +107,6 @@ (define-types-by-introspection "Gtk" ("GtkAdjustment" :ignore t) - ;; Temporary disabled - ("GtkCellRenderer" :ignore-prefix t) - - ;; Manual override ("GtkWidget" :slots @@ -177,8 +178,10 @@ (define-types-by-introspection "Gtk" :slots ((child :allocation :virtual - :getter bin-child - :setter (setf bin-child)))) + :getter "gtk_bin_get_child" + :setter (setf bin-child) + :reader bin-child + :type widget))) ("GtkTooltips" :slots diff --git a/pango/pango.lisp b/pango/pango.lisp index 54bdc9c..0465a8a 100644 --- a/pango/pango.lisp +++ b/pango/pango.lisp @@ -1,5 +1,5 @@ ;; Common Lisp bindings for GTK+ v2.0 -;; Copyright (C) 2001 Espen S. Johnsen +;; Copyright (C) 2001 Espen S. Johnsen ;; ;; This library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public @@ -15,13 +15,11 @@ ;; 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: pango.lisp,v 1.2 2001-05-29 16:56:13 espen Exp $ +;; $Id: pango.lisp,v 1.3 2001-11-12 22:37:21 espen Exp $ (in-package "PANGO") (eval-when (:compile-toplevel :load-toplevel :execute) - (init-types-in-library - "/opt/gnome/lib/libpango.so" - :ignore ("_pango_fribidi_get_type")) + (init-types-in-library "libpango.so" :ignore ("_pango_fribidi_get_type")) (define-types-by-introspection "Pango")) -- [mdw]