Added dependency to the gtk system and a couple of bug fixes

[clg] / gtk / gtktypes.lisp

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index 4474226..c949d5e 100644 (file)
--- a/gtk/gtktypes.lisp
+++ b/gtk/gtktypes.lisp
@@ -15,7 +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.33 2005-02-27 15:39:52 espen Exp $
+;; $Id: gtktypes.lisp,v 1.36 2005-04-19 08:11:39 espen Exp $
 
 (in-package "GTK")
 
@@ -123,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))))
@@ -933,11 +933,11 @@
   ("GtkUIManagerItemType"
    :type ui-manager-item-type)
 
-  ("GtkToggle"
+  ("GtkAction"
    :slots
    ((accelerator
-     :allocation :virtual
-     :getter action-accelerator)))
+     :allocation :user-data :initarg :accelerator 
+     :reader action-accelerator)))
 
   ("GtkToggleAction"
    :slots
@@ -956,12 +956,11 @@
      :getter "gtk_radio_button_get_group"
      :reader radio-action-group
      :type (copy-of (gslist widget)))
-    (%value
-     :allocation :property  :pname "value"
-     :readable nil :type int)
+    (self
+     :allocation :property :pname "value" :type int
+     :documentation "A hack so we can use the alien function gtk_radio_action_get_current_value to retrieve the active radio action in a group.")
     (value 
-     :allocation :virtual
-     :getter radio-action-value)))
+     :allocation :user-data :initarg :value :accessor radio-action-value)))
 
   ("GtkColorSelection"
    :slots
@@ -993,6 +992,12 @@
      :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)