From f784870faa01415440fae43823fd6ce4fc4884a6 Mon Sep 17 00:00:00 2001 From: espen Date: Wed, 12 Dec 2001 20:24:41 +0000 Subject: [PATCH] Updated for gtk-1.3.11 --- clg.system | 2 +- glib/callback.c | 5 ++--- glib/gboxed.lisp | 3 ++- glib/gparam.lisp | 12 ++++++------ gtk/gtkglue.c | 25 +------------------------ gtk/gtktypes.lisp | 17 ++--------------- gtk/gtkwidget.lisp | 4 +++- 7 files changed, 17 insertions(+), 51 deletions(-) diff --git a/clg.system b/clg.system index 654557d..d96ff67 100644 --- a/clg.system +++ b/clg.system @@ -6,7 +6,7 @@ ;; Uncomment and edit the next line if pkg-config needs to search for ;; .pc files in directories other than the default (/usr/lib/pkgconfig) -;(push '(:PKG_CONFIG_PATH . "/opt/gnome/lib/pkgconfig") ext:*environment-list*) +:(push '(:PKG_CONFIG_PATH . "/opt/gnome/lib/pkgconfig") ext:*environment-list*) (load "clg:tools;config") (load "clg:tools;sharedlib") diff --git a/glib/callback.c b/glib/callback.c index ac8f45a..1fa8cc1 100644 --- a/glib/callback.c +++ b/glib/callback.c @@ -16,9 +16,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: callback.c,v 1.5 2001-10-21 21:59:22 espen Exp $ */ +/* $Id: callback.c,v 1.6 2001-12-12 20:24:41 espen Exp $ */ -#include +#include #ifdef CMUCL #include "lisp.h" @@ -85,7 +85,6 @@ destroy_notify_address () #endif -#include GEnumValue* g_enum_class_values (GEnumClass *class, guint *n_values) { diff --git a/glib/gboxed.lisp b/glib/gboxed.lisp index 393cb18..e510722 100644 --- a/glib/gboxed.lisp +++ b/glib/gboxed.lisp @@ -15,12 +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: gboxed.lisp,v 1.6 2001-10-21 22:02:01 espen Exp $ +;; $Id: gboxed.lisp,v 1.7 2001-12-12 20:24:41 espen Exp $ (in-package "GLIB") (eval-when (:compile-toplevel :load-toplevel :execute) + (init-types-in-library "libgobject-1.3.so") (defclass boxed (proxy) () (:metaclass proxy-class) diff --git a/glib/gparam.lisp b/glib/gparam.lisp index eb34c13..9e52cb4 100644 --- a/glib/gparam.lisp +++ b/glib/gparam.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: gparam.lisp,v 1.4 2001-10-21 21:55:41 espen Exp $ +;; $Id: gparam.lisp,v 1.5 2001-12-12 20:24:41 espen Exp $ (in-package "GLIB") @@ -85,12 +85,12 @@ :type type-number) (nickname :allocation :virtual - :getter "g_param_get_nick" + :getter "g_param_spec_get_nick" :reader param-nickname :type string) (documentation :allocation :virtual - :getter "g_param_get_blurb" + :getter "g_param_spec_get_blurb" :reader param-documentation :type string)) (:metaclass ginstance-class) @@ -296,9 +296,9 @@ :type unsigned-int)) (:metaclass ginstance-class)) -(defclass param-closure (param) - () - (:metaclass ginstance-class)) +;; (defclass param-closure (param) +;; () +;; (:metaclass ginstance-class)) (defclass param-object (param) () diff --git a/gtk/gtkglue.c b/gtk/gtkglue.c index 2a2fbb8..8253555 100644 --- a/gtk/gtkglue.c +++ b/gtk/gtkglue.c @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: gtkglue.c,v 1.7 2001-10-21 23:22:53 espen Exp $ */ +/* $Id: gtkglue.c,v 1.8 2001-12-12 20:24:41 espen Exp $ */ #include @@ -270,29 +270,6 @@ gtk_layout_get_bin_window (GtkLayout *layout) return layout->bin_window; } -guint -gtk_layout_get_xoffset (GtkLayout *layout) -{ - return layout->xoffset; -} - -void -gtk_layout_set_xoffset (GtkLayout *layout, guint xoffset) -{ - return layout->xoffset = xoffset; -} - -guint -gtk_layout_get_yoffset (GtkLayout *layout) -{ - return layout->yoffset; -} - -void -gtk_layout_set_yoffset (GtkLayout *layout, guint yoffset) -{ - return layout->yoffset = yoffset; -} /* List */ diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp index a230ad1..85fbd1d 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.9 2001-11-12 22:32:17 espen Exp $ +;; $Id: gtktypes.lisp,v 1.10 2001-12-12 20:24:41 espen Exp $ (in-package "GTK") @@ -419,20 +419,7 @@ ((bin-window :getter "gtk_layout_get_bin_window" :reader layout-bin-window - :type gdk:window) - (x-offset - :getter "gtk_layout_get_xoffset" - :setter "gtk_layout_set_xoffset" - :accessor layout-x-offset - :initarg :x-offset - :type unsigned-int) - (y-offset - :getter "gtk_layout_get_yoffset" - :setter "gtk_layout_set_yoffset" - :accessor layout-y-offset - :initarg :x-offset - :type unsigned-int))) - + :type gdk:window))) ;; Not needed ("GtkFundamentalType" :ignore t) diff --git a/gtk/gtkwidget.lisp b/gtk/gtkwidget.lisp index 920fae1..4a59545 100644 --- a/gtk/gtkwidget.lisp +++ b/gtk/gtkwidget.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: gtkwidget.lisp,v 1.6 2001-11-20 18:25:53 espen Exp $ +;; $Id: gtkwidget.lisp,v 1.7 2001-12-12 20:24:41 espen Exp $ (in-package "GTK") @@ -96,6 +96,7 @@ (defbinding widget-unrealize () nil (widget widget)) +#| (defbinding widget-add-accelerator (widget signal accel-group key modifiers flags) nil (widget widget) @@ -128,6 +129,7 @@ (defbinding (widget-accelerators-locked-p "gtk_widget_accelerators_locked") () boolean (widget widget)) +|# (defbinding widget-event () int (widget widget) -- 2.11.0