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

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index cce4e9a..a3857b5 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.47 2006-04-26 20:31:12 espen Exp $
+;; $Id: gtktypes.lisp,v 1.56 2007-07-09 12:50:21 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)
@@ -326,6 +321,7 @@
      :accessor window-mnemonic-modifier
      :initarg :mnemonic-modifier
      :type gdk:modifier-type)
+    #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0")
     (transient-for
      :allocation :virtual
      :getter "gtk_window_get_transient_for"
@@ -513,8 +509,8 @@
 
   ("GtkToolbar"
    :slots
-   ((show-tooltips
-     :allocation :virtual
+   ((show-tooltips         ;; this slot is equivalent to the property
+     :allocation :virtual  ;; "tooltips" in Gtk+ 2.8
      :getter "gtk_toolbar_get_tooltips"
      :setter "gtk_toolbar_set_tooltips"
      :accessor toolbar-show-tooltips-p
@@ -525,7 +521,7 @@
      :getter "gtk_toolbar_get_tooltips_object"
      :reader toolbar-tooltips
      :type tooltips)
-    (toolbar-style
+    (toolbar-style ; defined manually to get the accesssor name correct
      :allocation :property
      :pname "toolbar-style"
      :initarg :toolbar-style
@@ -635,15 +631,11 @@
   ("GtkTable"
    :slots
    ((column-spacing
-     :allocation :virtual
-     :getter "gtk_table_get_default_col_spacing"
-     :setter "gtk_table_set_col_spacings"
+     :allocation :property :pname "column-spacing"
      :initarg :column-spacing
      :type unsigned-int)
     (row-spacing
-     :allocation :virtual
-     :getter "gtk_table_get_default_row_spacing"
-     :setter "gtk_table_set_row_spacings"
+     :allocation :property :pname "row-spacing"
      :initarg :row-spacing
      :type unsigned-int)))
 
@@ -886,8 +878,8 @@
      :type selection-mode)
     (tree-view
      :allocation :virtual
-     :getter "gtk_tree_selection_get_mode"
-     :reader tree-selection-mode
+     :getter "gtk_tree_selection_get_tree_view"
+     :reader tree-selection-tree-view
      :type tree-view)))
 
   ("GtkComboBox"
@@ -956,7 +948,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"
@@ -997,13 +989,14 @@
      :allocation :user-data :initarg :accelerator 
      :reader action-accelerator)))
 
+  #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0")
   ("GtkToggleAction"
    :slots
    ((active
      :allocation :virtual
      :getter "gtk_toggle_action_get_active"
      :setter "gtk_toggle_action_set_active"
-     :initarg :active
+;     :initarg :active ;; Handled by initialize-instance
      :accessor toggle-action-active-p
      :type boolean)))
 
@@ -1018,7 +1011,11 @@
      :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 :user-data :initarg :value :accessor radio-action-value)))
+     :allocation :user-data :initarg :value :accessor radio-action-value)
+    #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0")
+    ;; Use radio-action-get-current-value to get the current value of
+    ;; a radio action group
+    (current-value :ignore t)))
 
   ("GtkColorSelection"
    :slots
@@ -1075,6 +1072,22 @@
      :initarg :pixbuf-column
      :accessor icon-view-pixbuf-column)))
 
+  #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0")
+  ("GtkAssistant"
+   :slots
+   ((current-page 
+     :allocation :virtual
+     :getter "gtk_assistant_get_current_page"
+     :setter "gtk_assistant_set_current_page"
+     :accessor assistant-current-page
+     :type int)
+    (num-pages
+     :allocation :virtual
+     :getter "gtk_assistant_get_n_page"
+     :reader assistant-current-page
+     :type int)))
+
+
   ;; Not needed
   ("GtkFundamentalType" :ignore t)
   ("GtkArgFlags" :ignore t)
@@ -1269,8 +1282,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))