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

diff --git a/gtk/gtk.objects.lisp b/gtk/gtk.objects.lisp
index 7837a1e..5dc5980 100644
--- a/gtk/gtk.objects.lisp
+++ b/gtk/gtk.objects.lisp
@@ -1,7 +1,108 @@
 (in-package :gtk)
 
-(define-g-boxed-class "GtkBorder" border ()
+(define-g-boxed-cstruct border "GtkBorder"
   (left :int :initform 0)
   (right :int :initform 0)
   (top :int :initform 0)
-  (bottom :int :initform 0))
\ No newline at end of file
+  (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-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)
+(export 'tree-iter-user-data)
+
+(defctype tree-path :pointer)
+
+(defcfun gtk-tree-path-new :pointer)
+(defcfun gtk-tree-path-free :void (path :pointer))
+
+(define-g-boxed-opaque tree-path "GtkTreePath"
+  :alloc (gtk-tree-path-new))
+
+(defcfun (%gtk-tree-path-get-depth "gtk_tree_path_get_depth") :int
+  (path tree-path))
+
+(defcfun (%gtk-tree-path-get-indices "gtk_tree_path_get_indices") (:pointer :int)
+  (path tree-path))
+
+(defcfun (%gtk-tree-path-append-index "gtk_tree_path_append_index") :void
+  (path :pointer)
+  (index :int))
+
+(defun tree-path-indices (path)
+  (tree-path-get-indices path))
+
+(defun (setf tree-path-indices) (new-value path)
+  (tree-path-set-indices new-value path))
+
+(defun tree-path-get-indices (path)
+  (setf path (pointer path))
+  (let ((n (%gtk-tree-path-get-depth path))
+        (indices (%gtk-tree-path-get-indices path)))
+    (loop
+       for i from 0 below n
+       collect (mem-aref indices :int i))))
+
+(defun tree-path-set-indices (indices path)
+  (setf path (pointer path))
+  (loop 
+     repeat (%gtk-tree-path-get-depth path)
+     do (foreign-funcall "gtk_tree_path_up" :pointer path :boolean))
+  (loop
+     for index in indices
+     do(foreign-funcall "gtk_tree_path_append_index" :pointer path :int index :void)))
+
+(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))