X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/b6d4ac86c7f32c64e5a0debea5ad93f2f00672e7..f7f58f900d15c703dde92bb493e1764ab01ad5f5:/gtk/gtktypes.lisp

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index d51c181..1e56d38 100644
--- a/gtk/gtktypes.lisp
+++ b/gtk/gtktypes.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.
 
-;; $Id: gtktypes.lisp,v 1.46 2006-04-26 12:12:37 espen Exp $
+;; $Id: gtktypes.lisp,v 1.52 2007-01-02 15:15:25 espen Exp $
 
 (in-package "GTK")
 
@@ -114,17 +114,12 @@
   (:ref stock-item-copy)
   (:unref stock-item-free))
 
-;; We don't really need to access any slots in this class, so we just
-;; specify the total size
 (defclass tree-iter (boxed)  
-  (
-;;    (stamp :allocation :alien :type int)
-;;    (user-data :allocation :alien :type pointer)
-;;    (user-data2 :allocation :alien :type pointer)
-;;    (user-data3 :allocation :alien :type pointer)
-   )
-  (:metaclass boxed-class)
-  (:size #.(+ (size-of 'int) (* 3 (size-of 'pointer)))))
+  ((stamp :allocation :alien :type int)
+   (user-data :allocation :alien :type pointer)
+   (user-data2 :allocation :alien :type pointer)
+   (user-data3 :allocation :alien :type pointer))
+  (:metaclass boxed-class))
 
 
 ;; (defclass tree-path (boxed)
@@ -632,20 +627,20 @@
    ; deprecated property
    ((shadow :ignore t)))
 
-  ("GtkTable"
-   :slots
-   ((column-spacing
-     :allocation :virtual
-     :getter "gtk_table_get_default_col_spacing"
-     :setter "gtk_table_set_col_spacings"
-     :initarg :column-spacing
-     :type unsigned-int)
-    (row-spacing
-     :allocation :virtual
-     :getter "gtk_table_get_default_row_spacing"
-     :setter "gtk_table_set_row_spacings"
-     :initarg :row-spacing
-     :type unsigned-int)))
+;;   ("GtkTable"
+;;    :slots
+;;    ((column-spacing
+;;      :allocation :virtual
+;;      :getter "gtk_table_get_default_col_spacing"
+;;      :setter "gtk_table_set_col_spacings"
+;;      :initarg :column-spacing
+;;      :type unsigned-int)
+;;     (row-spacing
+;;      :allocation :virtual
+;;      :getter "gtk_table_get_default_row_spacing"
+;;      :setter "gtk_table_set_row_spacings"
+;;      :initarg :row-spacing
+;;      :type unsigned-int)))
 
   ("GtkDialog"
    :slots
@@ -956,7 +951,7 @@
      :allocation :virtual
      :getter "gtk_text_mark_get_name"
      :reader text-mark-name
-     :type string)
+     :type (copy-of string))
     (visible
      :allocation :virtual
      :getter "gtk_text_mark_get_visible"
@@ -1003,7 +998,7 @@
      :allocation :virtual
      :getter "gtk_toggle_action_get_active"
      :setter "gtk_toggle_action_set_active"
-     :initarg :active
+;     :initarg :active
      :accessor toggle-action-active-p
      :type boolean)))
 
@@ -1053,9 +1048,27 @@
   #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
   ("GtkIconView"
    :slots
-   ((text-column :merge t :setter %icon-view-set-text-column)
-    (markup-column :merge t :setter %icon-view-set-markup-column)
-    (pixbuf-column :merge t :setter %icon-view-set-pixbuf-column)))
+   ((text-column
+     :allocation :virtual
+     :getter %icon-view-get-text-column
+     :setter %icon-view-set-text-column
+     :boundp %icon-view-text-column-boundp
+     :initarg :text-column
+     :accessor icon-view-text-column)
+    (markup-column
+     :allocation :virtual
+     :getter %icon-view-get-markup-column
+     :setter %icon-view-set-tmarkup-column
+     :boundp %icon-view-markup-column-boundp
+     :initarg :markup-column
+     :accessor icon-view-markup-column)
+    (pixbuf-column
+     :allocation :virtual
+     :getter %icon-view-get-pixbuf-column
+     :setter %icon-view-set-pixbuf-column
+     :boundp %icon-view-pixbuf-column-boundp
+     :initarg :pixbuf-column
+     :accessor icon-view-pixbuf-column)))
 
   ;; Not needed
   ("GtkFundamentalType" :ignore t)
@@ -1251,8 +1264,14 @@
   (:metaclass boxed-class))
 
 
+#?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0")
 (defclass target-list (proxy)
   ()
   (:metaclass proxy-class)
   (:ref target-list-ref)
   (:unref target-list-unref))
+
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0")
+(defclass target-list (boxed)
+  ()
+  (:metaclass boxed-class))