X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gdk%2Fgdk.functions.lisp;h=922f841d3be6d0b7eb42c59c3d5dca62bbd069c8;hb=be3ed2fe370ef129390ac4926e9e41284363b00d;hp=fcbd990bca03a982d6e758fc70fea3ff8fdb9457;hpb=4fb186f420affca636ffe35d6e72a83df0d81a35;p=cl-gtk2.git

diff --git a/gdk/gdk.functions.lisp b/gdk/gdk.functions.lisp
index fcbd990..922f841 100644
--- a/gdk/gdk.functions.lisp
+++ b/gdk/gdk.functions.lisp
@@ -3,9 +3,6 @@
 (defcfun (default-screen "gdk_screen_get_default") (g-object gdk-screen))
 (export 'default-screen)
 
-(defcfun (default-display "gdk_display_get_default") (g-object display))
-(export 'default-display)
-
 (defcfun gdk-window-get-events event-mask
   (window (g-object gdk-window)))
 
@@ -19,40 +16,7 @@
 (defun (setf gdk-window-events) (new-value window)
   (gdk-window-set-events window new-value))
 
-(defcfun gdk-gc-new (g-object graphics-context)
-  (drawable (g-object drawable)))
-
-(defcfun gdk-draw-line :void
-  (drawable (g-object drawable))
-  (gc (g-object graphics-context))
-  (x1 :int)
-  (y1 :int)
-  (x2 :int)
-  (y2 :int))
-
-(defcfun gdk-gc-set-rgb-fg-color :void
-  (gc (g-object graphics-context))
-  (color (g-boxed-foreign color)))
-
-(defcfun gdk-drawable-get-size :void
-  (drawable (g-object drawable))
-  (width (:pointer :int))
-  (height (:pointer :int)))
-
-(defun drawable-get-size (drawable)
-  (with-foreign-objects ((x :int)
-                         (y :int))
-    (gdk-drawable-get-size drawable x y)
-    (values (mem-ref x :int) (mem-ref y :int))))
-
-(define-g-object-class "PangoLayout" pango-layout (:type-initializer "pango_layout_get_type") ())
-
-(defcfun gdk-draw-layout :void
-  (drawable (g-object drawable))
-  (gc (g-object graphics-context))
-  (x :int)
-  (y :int)
-  (layout (g-object pango-layout)))
+(export 'gdk-window-events)
 
 (defcfun gdk-atom-name (glib:g-string :free-from-foreign t)
   (atom gdk-atom))
@@ -61,9 +25,7 @@
   (name :string)
   (only-if-exists :boolean))
 
-(export 'drawable-size)
-
-(defcfun gdk-pixbuf-get-from-drawable (g-object pixbuf)
+(defcfun gdk-pixbuf-get-from-drawable (g-object pixbuf :already-referenced)
   (dest (g-object pixbuf))
   (src (g-object drawable))
   (colormap :pointer)
@@ -98,3 +60,13 @@
                     (null-pointer)))
 
 (export 'pixbuf-save)
+
+(defcfun gdk-pixbuf-new-from-file (g-object pixbuf :already-referenced)
+  (filename :string)
+  (error :pointer))
+
+(defun pixbuf-new-from-file (filename)
+  (glib:with-g-error (err)
+    (gdk-pixbuf-new-from-file filename err)))
+
+(export 'pixbuf-new-from-file)