Updated for gtk-1.3.11

diff --git a/clg.system b/clg.system
index 654557dd5e457582c841e6c7f31b25adb1650492..d96ff67793f25daf8edfaf0f54beeca2829e7ce4 100644 (file)
--- 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)
 
 ;; 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")
 
 (load "clg:tools;config")
 (load "clg:tools;sharedlib")

diff --git a/glib/callback.c b/glib/callback.c
index e08ee7917d4b6d476b2da6c263135fa309319f80..b872b8bfdf63c4f2c71ac3af88f96eae3f52174d 100644 (file)
--- a/glib/callback.c
+++ b/glib/callback.c
@@ -16,9 +16,9 @@
  * 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: 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 <gobject/gobject.h>
+#include <glib-object.h>

 
 #ifdef CMUCL
 #include "lisp.h"
 
 #ifdef CMUCL
 #include "lisp.h"


@@ -85,7 +85,6 @@ destroy_notify_address ()
 #endif
 
 
 #endif
 
 

-#include        <gobject/genums.h>

 GEnumValue*
 g_enum_class_values (GEnumClass *class, guint *n_values)
 {
 GEnumValue*
 g_enum_class_values (GEnumClass *class, guint *n_values)
 {

diff --git a/glib/gboxed.lisp b/glib/gboxed.lisp
index cfcaa2e8f7d256aff7cedc56199c9cbc6e946dee..2fb950f3cc1745bec7080bc7f86cef80993ac5b2 100644 (file)
--- 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
 
 ;; 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)
 
 (in-package "GLIB")
 
 
 (eval-when (:compile-toplevel :load-toplevel :execute)

+  (init-types-in-library "libgobject-1.3.so")

   (defclass boxed (proxy)
     ()
     (:metaclass proxy-class)
   (defclass boxed (proxy)
     ()
     (:metaclass proxy-class)

diff --git a/glib/gparam.lisp b/glib/gparam.lisp
index ddaeeef0e794309bab035bc3daf04a728fe9d334..8c0d4f345223fbfa49f09c28fca2f6152b458388 100644 (file)
--- 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
 
 ;; 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")
 
 
 (in-package "GLIB")
 


@@ -85,12 +85,12 @@   (defclass param (ginstance)
       :type type-number)
      (nickname
       :allocation :virtual
       :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
       :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)
       :reader param-documentation
       :type string))
     (:metaclass ginstance-class)


@@ -296,9 +296,9 @@ (defclass param-value-array (param)
     :type unsigned-int))
   (:metaclass ginstance-class))
 
     :type unsigned-int))
   (:metaclass ginstance-class))
 

-(defclass param-closure (param)
-  ()
-  (:metaclass ginstance-class))
+;; (defclass param-closure (param)
+;;   ()
+;;   (:metaclass ginstance-class))

 
 (defclass param-object (param)
   ()
 
 (defclass param-object (param)
   ()

diff --git a/gtk/gtkglue.c b/gtk/gtkglue.c
index 30181a683c99eb50a4351236ede88cd150ceba2f..a4968665cc62365f51186381f611cf28f10ad686 100644 (file)
--- a/gtk/gtkglue.c
+++ b/gtk/gtkglue.c
@@ -16,7 +16,7 @@
  * 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: 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 <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>


@@ -270,29 +270,6 @@ gtk_layout_get_bin_window (GtkLayout *layout)
   return layout->bin_window;
 }
 
   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 */
 
 
 /* List */
 

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index 8e51b24241175eb080aa4f35edf8dd7ce22ceae1..69399c37029b80678cbd3b1c50d5d91f8bee37f8 100644 (file)
--- 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
 
 ;; 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")
 
 
 (in-package "GTK")


@@ -419,20 +419,7 @@ (define-types-by-introspection "Gtk"
    ((bin-window
      :getter "gtk_layout_get_bin_window"
      :reader layout-bin-window
    ((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)
      
   ;; Not needed
   ("GtkFundamentalType" :ignore t)

diff --git a/gtk/gtkwidget.lisp b/gtk/gtkwidget.lisp
index 43766ccd3fb4e8cfbd76978e391c7dd3bef98e70..3f263bb56183d8b132e082dde68632e2d20dda58 100644 (file)
--- 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
 
 ;; 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")
 
 
 (in-package "GTK")
 


@@ -96,6 +96,7 @@ (defbinding widget-realize () nil
 (defbinding widget-unrealize () nil
   (widget widget))
 
 (defbinding widget-unrealize () nil
   (widget widget))
 

+#|

 (defbinding widget-add-accelerator
     (widget signal accel-group key modifiers flags) nil
   (widget widget)
 (defbinding widget-add-accelerator
     (widget signal accel-group key modifiers flags) nil
   (widget widget)


@@ -128,6 +129,7 @@ (defbinding widget-unlock-accelerators () nil
 (defbinding (widget-accelerators-locked-p "gtk_widget_accelerators_locked")
     () boolean
   (widget widget))
 (defbinding (widget-accelerators-locked-p "gtk_widget_accelerators_locked")
     () boolean
   (widget widget))

+|#

 
 (defbinding widget-event () int
   (widget widget)
 
 (defbinding widget-event () int
   (widget widget)