X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/e92ac804b9f2ac0abba60db45359af2c49ccbc43..4f1380af7f0e327a644c4525c6be30759a31f427:/gtk/gtktypes.lisp

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index 8672324..c6d7422 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.58 2007/10/17 16:55:47 espen Exp $
+;; $Id: gtktypes.lisp,v 1.61 2008/01/02 16:00:22 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"
@@ -667,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
@@ -875,6 +899,10 @@
      :reader tree-model-n-columns 
      :type int)))
 
+  ("GtkTreeModelFilter"
+   :slots
+   ((virtual-root :merge t :type tree-path)))
+
   ("GtkTreeSelection"
    :slots
    ((mode