Code clean up

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index ed3c1ac7e9dc00352fe61ee677fc8e2501b205c8..8b137ad31344c965f0416846ed8c3b9695f14c10 100644 (file)
--- a/gtk/gtk.lisp
+++ b/gtk/gtk.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

-;; $Id: gtk.lisp,v 1.47 2005-11-15 10:08:13 espen Exp $
+;; $Id: gtk.lisp,v 1.48 2006-02-04 12:17:45 espen Exp $

 
 
 (in-package "GTK")
 
 
 (in-package "GTK")


@@ -2231,7 +2231,7 @@ (defbinding %stock-lookup () boolean
 
 (defun stock-lookup (stock-id)
   (let ((location 
 
 (defun stock-lookup (stock-id)
   (let ((location 

-        (allocate-memory (proxy-instance-size (find-class 'stock-item)))))
+        (allocate-memory (foreign-size (find-class 'stock-item)))))

     (unwind-protect
        (when (%stock-lookup stock-id location)
          (ensure-proxy-instance 'stock-item (%stock-item-copy location)))
     (unwind-protect
        (when (%stock-lookup stock-id location)
          (ensure-proxy-instance 'stock-item (%stock-item-copy location)))

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index ef4bd03f7aed62c4412cdbf6030ac3f836898fb8..ab645e41389486914d6a247d5c85f9180cb51179 100644 (file)
--- a/gtk/gtkobject.lisp
+++ b/gtk/gtkobject.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

-;; $Id: gtkobject.lisp,v 1.28 2006-02-03 12:47:00 espen Exp $
+;; $Id: gtkobject.lisp,v 1.29 2006-02-04 12:17:45 espen Exp $

 
 
 (in-package "GTK")
 
 
 (in-package "GTK")


@@ -60,7 +60,7 @@ (defmethod initialize-instance :around ((object %object) &rest initargs)
   (call-next-method)
   ;; Add a temorary reference which will be removed when the object is
   ;; sinked
   (call-next-method)
   ;; Add a temorary reference which will be removed when the object is
   ;; sinked

-  (reference-foreign (class-of object) (proxy-location object))
+  (reference-foreign (class-of object) (foreign-location object))

   (%object-sink object))
 
 (defbinding %object-sink () nil
   (%object-sink object))
 
 (defbinding %object-sink () nil