X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/4007604e837a38d0d9fe54146ca34d4b16e90d09..c1df82a9ae71659e720d2f62be917d73c92208d9:/gtk/gtktypes.lisp

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index 3e2ce3a..908eb0b 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.53 2007-01-14 23:22:19 espen Exp $
+;; $Id: gtktypes.lisp,v 1.62 2008-01-10 22:11:15 espen Exp $
 
 (in-package "GTK")
 
@@ -41,13 +41,13 @@
 (defclass allocation (struct)
   ((x
     :allocation :alien
-    :accessor allocation-width
+    :accessor allocation-x
     :initarg :x
     :type int)
    (y
     :allocation :alien
-    :accessor allocation-width
-    :initarg :width
+    :accessor allocation-y
+    :initarg :y
     :type int)
    (width
     :allocation :alien
@@ -223,7 +223,15 @@
     (width-request
      :merge t :unbound -1)
     (height-request
-     :merge t :unbound -1)))
+     :merge t :unbound -1)
+    #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.12.0")
+    (tooltip-window
+     :allocation :virtual
+     :getter "gtk_widget_get_tooltip_window"
+     :setter "gtk_widget_set_tooltip_window"
+     :accessor widget-tooltip-window
+     :initarg :tooltip-window
+     :type window)))
      
   ("GtkContainer"
    :slots
@@ -376,6 +384,7 @@
      :accessor menu-item-right-justified-p
      :initarg :right-justified
      :type boolean)
+    #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.12.0")
     (submenu
      :allocation :virtual
      :getter "gtk_menu_item_get_submenu"
@@ -628,20 +637,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
@@ -671,8 +676,23 @@
      :accessor entry-completion
      :type entry-completion)
     (max-length :merge t :unbound 0)
+    (alignment
+     :allocation :virtual
+     :getter "gtk_entry_get_alignment"
+     :setter "gtk_entry_set_alignment"
+     :initarg :alignment
+     :accessor entry-alignment
+     :type single-float)
     #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
-    (width-chars :merge t :unbound -1)))
+    (width-chars :merge t :unbound -1)
+    #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.12.0")
+    (cursor-adjustment
+     :allocation :virtual
+     :getter "gtk_entry_get_cursor_hadjustment"
+     :setter "gtk_entry_set_cursor_hadjustment"
+     :initarg :cursor-hadjustment
+     :accessor entry-cursor-hadjustment
+     :type adjustment)))
 
   ("GtkEntryCompletion"
    :slots
@@ -682,8 +702,16 @@
      :reader entry-completion-entry
      :type entry)
     (minimum-key-length :merge t :unbound -1)
+    ;; Need to be manually defined, as this value through the property
+    ;; mechanism doesn't work
     #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
-    (text-column :merge t :unbound -1)))
+    (text-column
+     :allocation :virtual
+     :getter "gtk_entry_completion_get_text_column"
+     :setter "gtk_entry_completion_set_text_column"
+     :unbound -1
+     :accessor entry-completion-text-column
+     :type int)))
 
   ("GtkRadioButton"
    :slots
@@ -871,6 +899,10 @@
      :reader tree-model-n-columns 
      :type int)))
 
+  ("GtkTreeModelFilter"
+   :slots
+   ((virtual-root :merge t :type tree-path)))
+
   ("GtkTreeSelection"
    :slots
    ((mode
@@ -882,8 +914,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"
@@ -1026,16 +1058,16 @@
    ((previous-alpha
      :allocation :virtual
      :getter "gtk_color_selection_get_previous_alpha"
-     :setter "gtk_color_selection_get_previous_alpha"
+     :setter "gtk_color_selection_set_previous_alpha"
      :initarg :previous-alpha
      :accessor color-selection-previous-alpha
      :type (unsigned 16))
     (previous-color
      :allocation :virtual
-     :getter "gtk_color_selection_get_previous_color"
-     :setter "gtk_color_selection_get_previous_color"
+     :getter color-selection-previous-color
+     :setter "gtk_color_selection_set_previous_color"
      :initarg :previous-color
-     :accessor color-selection-previous-color
+     :writer (setf color-selection-previous-color)
      :type gdk:color)))
 
   ("GtkFontSelection"
@@ -1076,6 +1108,36 @@
      :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)))
+
+  #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0")
+  ("GtkRecentChooser"
+   :slots
+   ((current-item
+     :allocation :virtual
+     :getter "gtk_recent_chooser_get_current_item"
+     :reader recent-chooser-current-item
+     :type recent-info)
+    (current-uri
+     :allocation :virtual
+     :getter "gtk_recent_chooser_get_current_uri"
+     :setter %recent-chooser-set-current-uri
+     :accessor recent-chooser-current-uri
+     :type string)))
+
   ;; Not needed
   ("GtkFundamentalType" :ignore t)
   ("GtkArgFlags" :ignore t)