X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gtk%2Fgtk.objects.lisp;h=5dc5980dd0556a2e3a3c2363e64f76aac18f0be3;hb=280cc197440f3dec31bcbcd88b001b740be6e697;hp=9b75582bd74c033df4b759e29b0d60f804605e76;hpb=5fe17678137c04ece910ae65a35ee58a0c7761c7;p=cl-gtk2.git

diff --git a/gtk/gtk.objects.lisp b/gtk/gtk.objects.lisp
index 9b75582..5dc5980 100644
--- a/gtk/gtk.objects.lisp
+++ b/gtk/gtk.objects.lisp
@@ -6,11 +6,27 @@
   (top :int :initform 0)
   (bottom :int :initform 0))
 
+(at-init () (foreign-funcall "gtk_border_get_type" :int))
+(at-init () (foreign-funcall "gtk_ui_manager_get_type" :int))
+
+(export (boxed-related-symbols 'border))
+
+(define-foreign-type pointer-as-integer-foreign-type ()
+  ()
+  (:actual-type :pointer)
+  (:simple-parser pointer-as-integer))
+
+(defmethod translate-to-foreign (value (type pointer-as-integer-foreign-type))
+  (make-pointer value))
+
+(defmethod translate-from-foreign (value (type pointer-as-integer-foreign-type))
+  (pointer-address value))
+
 (define-g-boxed-cstruct tree-iter "GtkTreeIter"
   (stamp :int :initform 0)
-  (user-data :pointer :initform (null-pointer))
-  (user-data-2 :pointer :initform (null-pointer))
-  (user-data-3 :pointer :initform (null-pointer)))
+  (user-data pointer-as-integer :initform 0)
+  (user-data-2 pointer-as-integer :initform 0)
+  (user-data-3 pointer-as-integer :initform 0))
 
 (export 'tree-iter)
 (export 'tree-iter-stamp)
@@ -59,3 +75,34 @@
 
 (export 'tree-path)
 (export 'tree-path-indices)
+
+(define-g-enum "PangoWrapMode" pango-wrap-mode
+    (:export t :type-initializer
+             "pango_wrap_mode_get_type")
+  (:word 0) (:char 1) (:word-char 2))
+
+(define-g-enum "PangoEllipsizeMode" pango-ellipsize-mode
+    (:export t :type-initializer
+             "pango_ellipsize_mode_get_type")
+  (:none 0) (:start 1) (:middle 2) (:end 3))
+
+(defcfun (adjustment-clamp-page "gtk_adjustment_clamp_page") :void
+  (adjustment (g-object adjustment))
+  (lower :double)
+  (upper :double))
+
+(export 'adjustment-clamp-page)
+
+(define-g-boxed-cstruct requisition "GtkRequisition"
+  (width :int :initform 0)
+  (height :int :initform 0))
+
+(export (boxed-related-symbols 'requisition))
+
+(define-g-boxed-cstruct allocation "GtkAllocation"
+  (x :int :initform 0)
+  (y :int :initform 0)
+  (width :int :initform 0)
+  (height :int :initform 0))
+
+(export (boxed-related-symbols 'allocation))