Made iter argument to TREE-MODEL-ITER-N-CHILDREN optional

[clg] / gtk / gtktypes.lisp

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index 8e0fb81c9d0a0ebabddee0a7461fbd8e9ef1cc62..db1c2e16ae10eb601138d1eb297d7a7a733e5c28 100644 (file)
--- 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.40 2006-02-04 12:18:12 espen Exp $
+;; $Id: gtktypes.lisp,v 1.51 2006-09-27 08:45:29 espen Exp $
 
 (in-package "GTK")
 
@@ -110,19 +110,16 @@ (defclass stock-item (struct)
     :accessor stock-item-translation-domain
     :initarg :translation-domain
     :type string))
-  (:metaclass struct-class))
+  (:metaclass struct-class)
+  (: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)
@@ -136,11 +133,17 @@ (register-type 'tree-path '|gtk_tree_path_get_type|)
 (deftype position () 
   '(or int (enum (:start 0) (:end -1) (:first 0) (:last -1))))
 
-(defmethod reader-function ((type (eql 'position)) &rest args)
-  (declare (ignore type args))
-  (reader-function 'int))
+(define-type-method from-alien-form ((type position) form &key ref)
+  (declare (ignore type ref))
+  (from-alien-form 'int form))
 
+(define-type-method from-alien-function ((type position) &key ref)
+  (declare (ignore type ref))
+  (from-alien-function 'int))
 
+(define-type-method reader-function ((type position) &optional ref)
+  (declare (ignore type ref))
+  (reader-function 'int))
 
 (define-types-by-introspection "Gtk"
   ;; Manually defined
@@ -155,7 +158,7 @@ (define-types-by-introspection "Gtk"
   ("GtkWidget"
    :slots
    ((child-properties
-     :allocation :special
+     :special t
      :accessor widget-child-properties
      :type container-child)
     (window
@@ -227,14 +230,13 @@ (define-types-by-introspection "Gtk"
    ((child :ignore t)
     (children
      :allocation :virtual
-     :getter container-children
      :setter (setf container-children)
-     ;; The following doesn't work because gtk_container_get_children doesn't
-     ;; increase the reference count of the children
-;     :getter "gtk_container_get_children"
-;     :reader container-children
-;     :type (glist widget)
-     )
+     :getter "gtk_container_get_children"
+     :reader container-children
+     :type (glist (copy-of widget)))
+    (internal-children ; for debugging
+     :allocation :virtual
+     :getter container-internal-children)
     (child-type
      :allocation :virtual
      :getter "gtk_container_child_type"
@@ -307,7 +309,7 @@     (default-widget
      :type boolean)
     (icon-list
      :allocation :virtual
-     :getter "gtk_window_get_icon_list"
+     :getter %window-get-icon-list
      :setter "gtk_window_set_icon_list"
      :accessor window-icon-list
      :initarg :icon-list
@@ -337,6 +339,7 @@     (default-width :merge t :unbound -1)
     (default-height :merge t :unbound -1)))
   
   ("GtkWindowGroup"
+   :dependencies (window)
    :slots
    ((grabs
      :allocation :alien
@@ -410,26 +413,26 @@     (default-height :merge t :unbound -1)))
 
   ("GtkScrolledWindow"
    :slots
-   (#-gtk2.8
+   (#?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0")
     (hscrollbar
      :allocation  :alien
      :reader scrolled-window-hscrollbar
      :type widget)
-    #-gtk2.8
+    #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0")
     (vscrollbar
      :allocation :alien
      :reader scrolled-window-vscrollbar
      :type widget)
-    #+gtk2.8
+    #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0")
     (hscrollbar
      :allocation :virtual
      :getter "gtk_scrolled_window_get_hscrollbar"
      :reader scrolled-window-hscrollbar
      :type widget)
-    #+gtk2.8
+    #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0")
     (vscrollbar
      :allocation :virtual
-     :getter "gtk_scrolled_window_get_hscrollbar"
+     :getter "gtk_scrolled_window_get_vscrollbar"
      :reader scrolled-window-vscrollbar
      :type widget)))
 
@@ -478,7 +481,7 @@     (default-height :merge t :unbound -1)))
      :getter "gtk_menu_get_attach_widget"
      :reader menu-attach-widget
      :type widget)
-    #-gtk2.6
+    #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
     (tearoff-state
      :allocation :virtual
      :getter "gtk_menu_get_tearoff_state"
@@ -487,6 +490,22 @@     (default-height :merge t :unbound -1)))
      :initarg :tearoff-state
      :type boolean)))
 
+  ("GtkPlug"
+   :slots
+   ((id
+     :allocation :virtual
+     :getter "gtk_plug_get_id"
+     :reader plug-id
+     :type gdk:native-window)))
+
+  ("GtkSocket"
+   :slots
+   ((id
+     :allocation :virtual
+     :getter "gtk_socket_get_id"
+     :reader socket-id
+     :type gdk:native-window)))
+
   ("GtkToolbar"
    :slots
    ((show-tooltips
@@ -608,20 +627,20 @@     (default-height :merge t :unbound -1)))
    ; 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
@@ -651,7 +670,7 @@     (default-height :merge t :unbound -1)))
      :accessor entry-completion
      :type entry-completion)
     (max-length :merge t :unbound 0)
-    #+gtk2.6
+    #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
     (width-chars :merge t :unbound -1)))
 
   ("GtkEntryCompletion"
@@ -662,7 +681,7 @@     (default-height :merge t :unbound -1)))
      :reader entry-completion-entry
      :type entry)
     (minimum-key-length :merge t :unbound -1)
-    #+gtk2.6
+    #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
     (text-column :merge t :unbound -1)))
 
   ("GtkRadioButton"
@@ -742,7 +761,7 @@     (default-height :merge t :unbound -1)))
   ("GtkImage"
    :slots
    ((file :ignore t)
-    #+gtk2.6
+    #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
     (pixel-size :merge t :unbound -1)))
 
   ("GtkLabel"
@@ -932,7 +951,7 @@     (default-height :merge t :unbound -1)))
      :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"
@@ -979,7 +998,7 @@     (default-height :merge t :unbound -1)))
      :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)))
 
@@ -1026,12 +1045,30 @@     (default-height :merge t :unbound -1)))
      :reader clipboard-display
      :type gdk:display)))
 
-  #+gtk2.6
+  #?(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)
@@ -1178,12 +1215,11 @@ (defclass accel-group-entry (struct)
     :type quark))
   (:metaclass struct-class))
 
-#+gtk2.8
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0")
 (define-enum-type drop-position
   :no-drop :drop-into :drop-left :drop-right :drop-above :drop-below)
 
 
-
 (defclass target-entry (struct)
   ((target
     :allocation :alien
@@ -1202,4 +1238,34 @@ (defclass target-entry (struct)
     :type unsigned-int))
   (:metaclass struct-class))
 
-(deftype target-list () 'pointer)
+
+(defclass selection-data (boxed)
+  ((selection
+    :allocation :alien :type gdk:atom
+    :reader selection-data-selection)
+   (target
+    :allocation :alien :type gdk:atom
+    :reader selection-data-target)
+   (type
+    :allocation :alien :type gdk:atom
+    :reader selection-data-type)
+   (format 
+    :allocation :alien :type int
+    :reader selection-data-format)
+   (data
+    :allocation :alien :type pointer
+    :reader selection-data-data)
+   (length 
+    :allocation :alien :type int
+    :reader selection-data-length)
+   (display 
+    :allocation :alien :type gdk:display
+    :reader selection-data-display))
+  (:metaclass boxed-class))
+
+
+(defclass target-list (proxy)
+  ()
+  (:metaclass proxy-class)
+  (:ref target-list-ref)
+  (:unref target-list-unref))