Manual overriding some slot setters for icon-view

[clg] / gtk / gtktypes.lisp

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index 41e599d..a6cfa19 100644 (file)
--- a/gtk/gtktypes.lisp
+++ b/gtk/gtktypes.lisp
@@ -15,8 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gtktypes.lisp,v 1.30 2005-01-12 13:38:18 espen Exp $
-
+;; $Id: gtktypes.lisp,v 1.35 2005-03-13 18:10:14 espen Exp $
 
 (in-package "GTK")
 
@@ -124,7 +123,7 @@
 ;;   (:metaclass boxed-class))
 
 (deftype tree-path () '(vector integer))
-(register-type 'tree-path "GtkTreePath")
+(register-type 'tree-path '|gtk_tree_path_get_type|)
 
 (deftype position () 
   '(or int (enum (:start 0) (:end -1) (:first 0) (:last -1))))
@@ -133,15 +132,6 @@
   (declare (ignore type args))
   (reader-function 'int))
 
-;; Forward definitions
-(defclass widget (%object)
-  ()
-  (:metaclass gobject-class))
-(defclass container (widget)
-  ()
-  (:metaclass gobject-class))
-
-
 (define-types-by-introspection "Gtk"
   ;; Manually defined
   ("GtkObject" :ignore t)
@@ -163,6 +153,8 @@
      :getter "gtk_widget_get_window"
      :reader widget-window
      :type gdk:window)
+    (parent :merge t :initarg nil)
+    (visible :merge t :initarg nil)
     (parent-window
      :allocation :virtual
      :getter %widget-parent-window
@@ -626,7 +618,7 @@
      :type entry-completion)
     (max-length :merge t :unbound 0)
     #+gtk2.6
-    (with-chars :merge t :unbound -1)))
+    (width-chars :merge t :unbound -1)))
 
   ("GtkEntryCompletion"
    :slots
@@ -993,6 +985,21 @@
    ; deprecated property
    ((font :ignore t)))
 
+  ("GtkClipboard"
+   :slots
+   ((display
+     :allocation :virtual
+     :getter "gtk_clipboard_get_display"
+     :reader clipboard-display
+     :type gdk:display)))
+
+  #+gtk2.6
+  ("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)))
+
   ;; Not needed
   ("GtkFundamentalType" :ignore t)
   ("GtkArgFlags" :ignore t)
@@ -1021,9 +1028,7 @@
   ;; What are these?
   ("GtkFileSystemModule" :ignore t)
   ("GtkIMModule" :ignore t)
-  ("GtkThemeEngine" :ignore t)
-
-  )
+  ("GtkThemeEngine" :ignore t))
 
 
 (defclass text-iter (boxed)