X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/112ac1d33aa8f9b7f3d2f9542d15431f152b1d35..1f091d0115dbcf40f1d01b14ffcdd8d76cd92a44:/gtk/gtktypes.lisp

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index 09fadb1..a53956b 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.37 2005-04-23 16:48:52 espen Exp $
+;; $Id: gtktypes.lisp,v 1.39 2005-09-26 21:34:53 espen Exp $
 
 (in-package "GTK")
 
@@ -375,6 +375,15 @@
      :initarg :submenu
      :type widget)))
 
+  ("GtkMenuShell"
+   :slots
+   ((take-focus-p
+     :allocation :virtual
+     :getter "gtk_menu_shell_get_take_focus"
+     :setter "gtk_menu_shell_set_take_focus"
+     :accessor menu-shell-take-focus-p
+     :type boolean)))
+
   ("GtkColorSelectionDialog"
    :slots
    ((colorsel
@@ -396,13 +405,27 @@
 
   ("GtkScrolledWindow"
    :slots
-   ((hscrollbar
-     :allocation :alien
+   (#-gtk2.8
+    (hscrollbar
+     :allocation  :alien
      :reader scrolled-window-hscrollbar
      :type widget)
+    #-gtk2.8
     (vscrollbar
      :allocation :alien
      :reader scrolled-window-vscrollbar
+     :type widget)
+    #+gtk2.8
+    (hscrollbar
+     :allocation :virtual
+     :getter "gtk_scrolled_window_get_hscrollbar"
+     :reader scrolled-window-hscrollbar
+     :type widget)
+    #+gtk2.8
+    (vscrollbar
+     :allocation :virtual
+     :getter "gtk_scrolled_window_get_hscrollbar"
+     :reader scrolled-window-vscrollbar
      :type widget)))
 
   ("GtkPaned"
@@ -1128,3 +1151,33 @@
     :initarg :mime-type
     :type string))
   (:metaclass struct-class))
+
+
+(defclass accel-key (struct)
+  ((key
+    :allocation :alien
+    :type unsigned-int)
+   (modifiers
+    :allocation :alien
+    :type gdk:modifier-type)
+   (flags
+    :allocation :alien
+    :type (unsigned 16)))
+  (:metaclass struct-class))
+
+(defclass accel-group-entry (struct)
+  ((key
+    :allocation :alien
+    :setter nil
+    :type (inlined accel-key))
+   (gclosure
+    :allocation :alien
+    :type gclosure)
+   (accel_path_quark
+    :allocation :alien
+    :type quark))
+  (:metaclass struct-class))
+
+#+gtk2.8
+(define-enum-type drop-position
+  :no-drop :drop-into :drop-left :drop-right :drop-above :drop-below)