X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/36f9a01bda347b051138f4bcb118bca876490344..ee57d221d4e667527d0d2f1570bef53e7622730c:/gtk/gtktypes.lisp

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index 1e56d38..64caa0c 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.52 2007-01-02 15:15:25 espen Exp $
+;; $Id: gtktypes.lisp,v 1.55 2007-07-05 11:34:27 espen Exp $
 
 (in-package "GTK")
 
@@ -321,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"
@@ -508,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
@@ -520,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
@@ -627,20 +628,16 @@
    ; 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 :property :pname "column-spacing"
+     :initarg :column-spacing
+     :type unsigned-int)
+    (row-spacing
+     :allocation :property :pname "row-spacing"
+     :initarg :row-spacing
+     :type unsigned-int)))
 
   ("GtkDialog"
    :slots
@@ -992,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)))
 
@@ -1013,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
@@ -1070,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)