Merge branch 'master' into bindings-coverage

Conflicts:
	generating.lisp
	gtk/gtk.window.lisp

diff --combined generating.lisp
index 98f5f37,44b404b..5a1dbd5
--- 1/generating.lisp
--- 2/generating.lisp
+++ b/generating.lisp
@@@ -69,8 -69,7 +69,8 @@@
                  "GtkTextBuffer" "GtkTextChildAnchor" "GtkTextMark" "GtkTextTag"
                  "GtkTextTagTable" "GtkTreeModelFilter" "GtkTreeModelSort"
                  "GtkTreeSelection" "GtkTreeStore" "GtkUIManager" "GtkWindowGroup"
 -                "GtkToggleAction" "GtkRecentAction" "GtkRadioAction" "GtkItemFactory")
 +                "GtkToggleAction" "GtkRecentAction" "GtkRadioAction" "GtkItemFactory"
 +              "GtkFileSelection" "GtkPageSetupUnixDialog" "GtkPrintUnixDialog")
       :flags '("GtkTextSearchFlags" "GtkAccelFlags" "GtkArgFlags" "GtkAttachOptions"
                "GtkButtonAction" "GtkCalendarDisplayOptions" "GtkCellRendererState"
                "GtkDebugFlag" "GtkDestDefaults" "GtkDialogFlags" "GtkFileFilterFlags"
@@@ -105,22 -104,12 +105,19 @@@
                "GtkSubmenuDirection" "GtkSubmenuPlacement" "GtkTextWindowType"
                "GtkToolbarChildType" "GtkToolbarSpaceStyle" "GtkTreeViewDropPosition"
                "GtkTreeViewMode" "GtkVisibility")
-      :exclusions '("PangoStretch" "PangoVariant" "PangoStyle" "PangoUnderline")
+      :exclusions '("PangoStretch" "PangoVariant" "PangoStyle" "PangoUnderline" "GtkGLDrawingArea")
       :additional-properties
 -     '(("GtkTreeViewColumn"
 +     '(("GtkWindow"
 +      (:cffi gtk::focus gtk::gtk-window-focus (g-object gtk::widget) "gtk_window_get_focus" "gtk_window_set_focus")
 +      (:cffi gtk::default-widget gtk::gtk-window-default-widget (g-object gtk::widget) "gtk_window_get_default_widget" "gtk_window_set_default")
 +      (:cffi gtk::has-frame gtk::gtk-window-has-frame :boolean "gtk_window_get_has_frame" "gtk_window_set_has_frame")
 +      (:cffi gtk::mnemonic-modifier gtk::gtk-window-mnemonic-modifier (g-object gdk::modifier-type) "gtk_window_get_mnemonic_modifier" "gtk_window_set_mnemonic_modifier")
 +      (:cffi gtk::icon-list gtk::gtk-window-icon-list (glist gtk::pixbuf :free-from-foreign t :free-to-foreign t) "gtk_window_get_icon_list" "gtk_window_set_icon_list")
 +      (:cffi gtk::group gtk::gtk-window-group (g-object gtk::window-group) "gtk_window_get_group" nil))
-        ("GtkDialog"
-       (:cffi gtk::action-area gtk::dialog-action-area (g-object gtk::widget) "gtk_dialog_get_action_area" nil)
-       (:cffi gtk::content-area gtk::dialog-content-area (g-object gtk::widget) "gtk_dialog_get_content_area" nil))
 +       ("GtkTreeViewColumn"
          (:cffi gtk::tree-view gtk::tree-view-column-tree-view g-object "gtk_tree_view_column_get_tree_view" nil)
          (:cffi gtk::sort-column-id gtk::tree-view-column-sort-column-id :int "gtk_tree_view_column_get_sort_column_id" "gtk_tree_view_column_set_sort_column_id")
 -        (:cffi gtk::cell-renderers gtk::tree-view-column-cell-renderers (glist g-object  :free-from-foreign t) "gtk_tree_view_column_get_cell_renderers" nil))
 +        (:cffi gtk::cell-renderers gtk::tree-view-column-cell-renderers (glist g-object :free-from-foreign t) "gtk_tree_view_column_get_cell_renderers" nil))
         ("GtkTreeSelection"
          (:cffi gtk::mode gtk::tree-selection-mode gtk::selection-mode "gtk_tree_selection_get_mode" "gtk_tree_selection_set_mode")
          (:cffi gtk::select-function gtk::tree-selection-select-function nil gtk::tree-selection-get-selection-function gtk::tree-selection-set-select-function))
@@@ -188,20 -177,18 +185,26 @@@
          (:cffi gtk::composite-name gtk::widget-composite-name (glib:g-string :free-from-foreign t :free-to-foreign t) "gtk_widget_get_composite_name" "gtk_widget_set_composite_name")
          (:cffi gtk::redraw-on-allocate gtk::widget-redraw-on-allocate :boolean nil "gtk_widget_set_redraw_on_allocate")
          (:cffi gtk::accessible gtk::widget-accessible g-object "gtk_widget_get_accessible" nil)
 -        (:cffi gtk::tooltip-window gtk::widget-tooltip-window g-object "gtk_widget_get_tooltip_window" "gtk_widget_set_tooltip_window"))
 -       ("GtkWindow"
 -        (:cffi gtk::default-widget gtk::window-default-widget (g-object gtk::widget) "gtk_window_get_default_widget" "gtk_window_set_default")
 -        (:cffi gtk::focus gtk::window-focus (g-object gtk::widget) "gtk_window_get_focus" "gtk_window_set_focus"))
 -       ("GtkWindowGroup"
 -        (:cffi gtk::windows gtk::window-group-windows (glist (g-object gtk::window)) "gtk_window_group_list_windows" nil))
 +        (:cffi gtk::tooltip-window gtk::widget-tooltip-window g-object "gtk_widget_get_tooltip_window" "gtk_widget_set_tooltip_window")
 +
 +      (:cffi gtk::parent-window gtk::widget-parent-window (g-object gdk::window) "gtk_widget_get_parent_window" "gtk_widget_set_parent_window")
 +      (:cffi gtk::toplevel gtk::widget-toplevel (g-object gtk::widget) "gtk_widget_get_toplevel" nil)
 +      (:cffi gtk::colormap gtk::widget-colormap (g-object gdk::gdk-colormap) "gtk_widget_get_colormap" "gtk_widget_set_colormap")
 +      (:cffi gtk::visual gtk::widget-visual (g-object gdk::visual) "gtk_widget_get_visual" nil)
 +      (:cffi gtk::modifier-style gtk::widget-modifier-style (g-object gtk::rc-style) "gtk_widget_get_modifier_style" "gtk_widget_modify_style")
 +      (:cffi gtk::pango-context gtk::widget-pango-context g-object "gtk_widget_get_pango_context" nil)
 +      (:cffi gtk::child-visible gtk::widget-child-visible :boolean "gtk_widget_get_child_visible" "gtk_widget_set_child_visible"))
         ("GtkTextTag"
          (:cffi gtk::priority gtk::text-tag-priority :int "gtk_text_tag_get_priority" "gtk_text_tag_set_priority"))
 +       ("GtkPageSetupUnixDialog"
 +      (:cffi gtk::page-setup gtk::page-setup-unix-dialog-page-setup (g-object gtk::page-setup) "gtk_page_setup_unix_dialog_get_page_setup" "gtk_page_setup_unix_dialog_set_page_setup")
-       (:cffi gtk::print-settings gtk::page-setup-unix-dialog-print-settings (g-object gtk::print-settings) "gtk_page_setup_unix_dialog_get_print_settings" "gtk_page_setup_unix_dialog_set_print_settings"))))))
++      (:cffi gtk::print-settings gtk::page-setup-unix-dialog-print-settings (g-object gtk::print-settings) "gtk_page_setup_unix_dialog_get_print_settings" "gtk_page_setup_unix_dialog_set_print_settings"))
++       ("GtkWindowGroup"
++        (:cffi gtk::windows gtk::window-group-windows (glist (g-object gtk::window)) "gtk_window_group_list_windows" nil))
+        ("GtkDialog"
+         (:cffi gtk::content-area gtk::dialog-content-area (g-object gtk::v-box) "gtk_dialog_get_content_area" nil)
+         (:cffi gtk::action-area gtk::dialog-action-area (g-object gtk::widget) "gtk_dialog_get_action_area" nil)
+         (:cffi gtk::default-response gtk::dialog-default-response gtk::response-type nil "gtk_dialog_set_default_response"))))))
  
  (defun gtk-generate-child-properties (filename)
    (with-open-file (stream filename :direction :output :if-exists :supersede)

diff --combined gtk/gtk.dialog.lisp
index 0d93879,5991e33..d6232bd
--- 1/gtk/gtk.dialog.lisp
--- 2/gtk/gtk.dialog.lisp
+++ b/gtk/gtk.dialog.lisp
@@@ -25,16 -25,6 +25,6 @@@
  
  (export 'dialog-add-action-widget)
  
- (defcfun (dialog-set-default-response "gtk_dialog_set_default_response") :void
-   (dialog (g-object dialog))
-   (response response-type))
- 
- (defun (setf dialog-default-response) (response dialog)
-   (dialog-set-default-response dialog response)
-   response)
- 
- (export 'dialog-default-response)
- 
  (defcfun (dialog-set-response-sensitive "gtk_dialog_set_response_sensitive") :void
    (dialog (g-object dialog))
    (response response-type)
@@@ -58,7 -48,7 +48,7 @@@
    (n-params :int)
    (new-order (:pointer response-type)))
  
- (defun (setf dialog-alternative-button-order) (response-list dialog)
+ (defun set-dialog-alternative-button-order (dialog response-list)
    (with-foreign-object (new-order 'response-type (length response-list))
      (loop
         for i from 0
@@@ -67,8 -57,6 +57,6 @@@
      (dialog-set-alternative-button-order-from-array dialog (length response-list) new-order))
    response-list)
  
- (export 'dialog-alternative-button-order)
- 
  (defmacro with-gtk-message-error-handler (&body body)
    (let ((dialog (gensym))
          (e (gensym)))
@@@ -81,4 -69,4 +69,4 @@@
                             (object-destroy ,dialog)
                             nil)))))
  
 -(export 'with-gtk-message-error-handler)
 +(export 'with-gtk-message-error-handler)

diff --combined gtk/gtk.window.lisp
index 311854e,d67bbbf..85867f5
--- 1/gtk/gtk.window.lisp
--- 2/gtk/gtk.window.lisp
+++ b/gtk/gtk.window.lisp
@@@ -1,71 -1,97 +1,71 @@@
  (in-package :gtk)
  
 -(defcfun (window-add-accel-group "gtk_window_add_accel_group") :void
 +(defcfun (gtk-window-add-accel-group "gtk_window_add_accel_group") :void
    (window (g-object gtk-window))
    (accel-group (g-object accel-group)))
  
 -(export 'window-add-accel-group)
 +(export 'gtk-window-add-accel-group)
  
 -(defcfun (window-remove-accel-group "gtk_window_remove_accel_group") :void
 +(defcfun (gtk-window-remove-accel-group "gtk_window_remove_accel_group") :void
    (window (g-object gtk-window))
    (accel-group (g-object accel-group)))
  
 -(export 'window-remove-accel-group)
 +(export 'gtk-window-remove-accel-group)
  
 -(defcfun (window-activate-focus "gtk_window_activate_focus") :boolean
 +(defcfun (gtk-window-activate-focus "gtk_window_activate_focus") :boolean
    (window (g-object gtk-window)))
  
 -(export 'window-activate-focus)
 +(export 'gtk-window-activate-focus)
  
 -(defcfun (window-activate-default "gtk_window_activate_default") :boolean
 +(defcfun (gtk-window-activate-default "gtk_window_activate_default") :boolean
    (window (g-object gtk-window)))
  
 -(export 'window-activate-default)
 +(export 'gtk-window-activate-default)
  
 -(defcfun (window-set-geometry-hints "gtk_window_set_geometry_hints") :void
 +(defcfun (gtk-window-set-geometry-hints "gtk_window_set_geometry_hints") :void
    (window (g-object gtk-window))
    (geometry-widget (g-object widget))
    (geometry (g-boxed-foreign geometry))
    (geometry-mask window-hints))
  
 -(export 'window-set-geometry-hints)
 +(export 'gtk-window-set-geometry-hints)
  
 -(defcfun (window-list-toplevels "gtk_window_list_toplevels") (glist (g-object gtk-window) :free-from-foreign t))
 +(defcfun (gtk-window-list-toplevels "gtk_window_list_toplevels") (glist (g-object gtk-window) :free-from-foreign t))
  
 -(export 'window-list-toplevels)
 +(export 'gtk-window-list-toplevels)
  
 -(defcfun (window-add-mnemonic "gtk_window_add_mnemonic") :void
 +(defcfun (gtk-window-add-mnemonic "gtk_window_add_mnemonic") :void
    (window (g-object gtk-window))
    (keyval :uint)
    (target (g-object widget)))
  
 -(export 'window-add-mnemonic)
 +(export 'gtk-window-add-mnemonic)
  
 -(defcfun (window-remove-mnemonic "gtk_window_remove_mnemonic") :void
 +(defcfun (gtk-window-remove-mnemonic "gtk_window_remove_mnemonic") :void
    (window (g-object gtk-window))
    (keyval :uint)
    (target (g-object widget)))
  
 -(export 'window-remove-mnemonic)
 +(export 'gtk-window-remove-mnemonic)
  
 -(defcfun (window-activate-mnemonic "gtk_window_mnemonic_activate") :boolean
 +(defcfun (gtk-window-activate-mnemonic "gtk_window_mnemonic_activate") :boolean
    (window (g-object gtk-window))
    (keyval :uint)
    (modifier modifier-type))
  
 -(export 'window-activate-mnemonic)
 +(export 'gtk-window-activate-mnemonic)
  
 -(defcfun (window-activate-key "gtk_window_activate_key") :boolean
 +(defcfun (gtk-window-activate-key "gtk_window_activate_key") :boolean
    (window (g-object gtk-window))
    (event (g-boxed-foreign event)))
  
 -(export 'window-activate-key)
 +(export 'gtk-window-activate-key)
  
 -(defcfun (window-propagate-key-event "gtk_window_propagate_key_event") :boolean
 +(defcfun (gtk-window-propagate-key-event "gtk_window_propagate_key_event") :boolean
    (window (g-object gtk-window))
    (event (g-boxed-foreign event)))
  
 -(export 'window-propagate-key-event)
 -
 -(defcfun (window-focus "gtk_window_get_focus") (g-object widget)
 -  (window (g-object gtk-window)))
 -
 -(defcfun (window-set-focus "gtk_window_set_focus") :void
 -  (window (g-object gtk-window))
 -  (focus (g-object widget)))
 -
 -(defun (setf window-focus) (focus window)
 -  (window-set-focus window focus)
 -  focus)
 -
 -(export 'window-focus)
 -
 -(defcfun (window-default-widget "gtk_window_get_default_widget") (g-object widget)
 -  (window (g-object gtk-window)))
 -
 -(defcfun (window-set-default-widget "gtk_window_set_default") :void
 -  (window (g-object gtk-window))
 -  (default-widget (g-object widget)))
 -
 -(defun (setf window-default-widget) (default-widget window)
 -  (window-set-default-widget window default-widget)
 -  default-widget)
 -
 -(export 'window-default-widget)
 +(export 'gtk-window-propagate-key-event)
  
  (defcfun (present-window "gtk_window_present") :void
    (window (g-object gtk-window)))
@@@ -78,59 -104,59 +78,59 @@@
  
  (export 'present-window-with-time)
  
- (defcfun (iconify-window "gtk_window_iconify") :void
+ (defcfun (window-iconify "gtk_window_iconify") :void
    (window (g-object gtk-window)))
  
- (export 'iconify-window)
+ (export 'window-iconify)
  
- (defcfun (deiconify-window "gtk_window_deiconify") :void
+ (defcfun (window-deiconify "gtk_window_deiconify") :void
    (window (g-object gtk-window)))
  
- (export 'deiconify-window)
+ (export 'window-deiconify)
  
- (defcfun (stick-window "gtk_window_stick") :void
+ (defcfun (window-stick "gtk_window_stick") :void
    (window (g-object gtk-window)))
  
- (export 'stick-window)
+ (export 'window-stick)
  
- (defcfun (unstick-window "gtk_window_unstick") :void
+ (defcfun (window-unstick "gtk_window_unstick") :void
    (window (g-object gtk-window)))
  
- (export 'unstick-window)
+ (export 'window-unstick)
  
- (defcfun (maximize-window "gtk_window_maximize") :void
+ (defcfun (window-maximize "gtk_window_maximize") :void
    (window (g-object gtk-window)))
  
- (export 'maximize-window)
+ (export 'window-maximize)
  
- (defcfun (unmaximize-window "gtk_window_unmaximize") :void
+ (defcfun (window-unmaximize "gtk_window_unmaximize") :void
    (window (g-object gtk-window)))
  
- (export 'unmaximize-window)
+ (export 'window-unmaximize)
  
- (defcfun (fullscreen-window "gtk_window_fullscreen") :void
+ (defcfun (window-fullscreen "gtk_window_fullscreen") :void
    (window (g-object gtk-window)))
  
- (export 'fullscreen-window)
+ (export 'window-fullscreen)
  
- (defcfun (unfullscreen-window "gtk_window_unfullscreen") :void
+ (defcfun (window-unfullscreen "gtk_window_unfullscreen") :void
    (window (g-object gtk-window)))
  
- (export 'unfullscreen-window)
+ (export 'window-unfullscreen)
  
 -(defcfun (window-set-keep-above "gtk_window_set_keep_above") :void
 +(defcfun (gtk-window-set-keep-above "gtk_window_set_keep_above") :void
    (window (g-object gtk-window))
    (setting :boolean))
  
 -(export 'window-set-keep-above)
 +(export 'gtk-window-set-keep-above)
  
 -(defcfun (window-set-keep-below "gtk_window_set_keep_below") :void
 +(defcfun (gtk-window-set-keep-below "gtk_window_set_keep_below") :void
    (window (g-object gtk-window))
    (setting :boolean))
  
 -(export 'window-set-keep-below)
 +(export 'gtk-window-set-keep-below)
  
 -(defcfun (window-begin-resize-drag "gtk_window_begin_resize_drag") :void
 +(defcfun (gtk-window-begin-resize-drag "gtk_window_begin_resize_drag") :void
    (window (g-object gtk-window))
    (edge window-edge)
    (button :int)
@@@ -138,93 -164,110 +138,93 @@@
    (root-y :int)
    (timestamp :uint32))
  
 -(export 'window-begin-resize-drag)
 +(export 'gtk-window-begin-resize-drag)
  
 -(defcfun (window-begin-move-drag "gtk_window_begin_move_drag") :void
 +(defcfun (gtk-window-begin-move-drag "gtk_window_begin_move_drag") :void
    (window (g-object gtk-window))
    (button :int)
    (root-x :int)
    (root-y :int)
    (timestamp :uint32))
  
 -(export 'window-begin-move-drag)
 +(export 'gtk-window-begin-move-drag)
  
 -(defcfun (window-set-frame-dimensions "gtk_window_set_frame_dimensions") :void
 +(defcfun (gtk-window-set-frame-dimensions "gtk_window_set_frame_dimensions") :void
    (window (g-object gtk-window))
    (left :int)
    (top :int)
    (right :int)
    (bottom :int))
  
 -(export 'window-set-frame-dimensions)
 +(export 'gtk-window-set-frame-dimensions)
  
 -(defcfun (window-set-has-frame "gtk_window_set_has_frame") :void
 +(defcfun (gtk-window-set-has-frame "gtk_window_set_has_frame") :void
    (window (g-object gtk-window))
    (setting :boolean))
  
 -(export 'window-set-has-frame)
 +(export 'gtk-window-set-has-frame)
  
 -(defcfun (window-set-mnemonic-modifier "gtk_window_set_mnemonic_modifier") :void
 +(defcfun (gtk-window-set-mnemonic-modifier "gtk_window_set_mnemonic_modifier") :void
    (window (g-object gtk-window))
    (modifier modifier-type))
  
 -(export 'window-set-mnemonic-modifier)
 -
 -(defcfun (window-icon-list "gtk_window_get_icon_list") (glist pixbuf :free-from-foreign t)
 -  (window (g-object gtk-window)))
 -
 -(defcfun (window-set-icon-list "gtk_window_set_icon_list") :void
 -  (window (g-object gtk-window))
 -  (icons (glist pixbuf :free-to-foreign t)))
 -
 -(defun (setf window-icon-list) (icon-list window)
 -  (window-set-icon-list window icon-list))
 -
 -(export 'window-icon-list)
 +(export 'gtk-window-set-mnemonic-modifier)
  
 -(defcfun (%window-get-position "gtk_window_get_position") :void
 +(defcfun (%gtk-window-get-position "gtk_window_get_position") :void
    (window (g-object gtk-window))
    (root-x (:pointer :int))
    (root-y (:pointer :int)))
  
 -(defun window-get-position (window)
 +(defun gtk-window-get-position (window)
    (with-foreign-objects ((x :int)
                           (y :int))
 -    (%window-get-position window x y)
 +    (%gtk-window-get-position window x y)
      (values (mem-ref x :int) (mem-ref y :int))))
  
 -(export 'window-get-position)
 +(export 'gtk-window-get-position)
  
 -(defcfun (%window-get-size "gtk_window_get_size") :void
 +(defcfun (%gtk-window-get-size "gtk_window_get_size") :void
    (window (g-object gtk-window))
    (width (:pointer :int))
    (height (:pointer :int)))
  
 -(defun window-size (window)
 +(defun gtk-window-size (window)
    (with-foreign-objects ((width :int)
                           (height :int))
 -    (%window-get-size window width height)
 +    (%gtk-window-get-size window width height)
      (values (mem-ref width :int) (mem-ref height :int))))
  
 -(export 'window-size)
 -
 -(defcfun (window-group "gtk_window_get_group") (g-object window-group)
 -  (window (g-object gtk-window)))
 -
 -(export 'window-group)
 +(export 'gtk-window-size)
  
- (defcfun (move-window "gtk_window_move") :void
+ (defcfun (window-move "gtk_window_move") :void
    (window (g-object gtk-window))
    (x :int)
    (y :int))
  
- (export 'move-window)
+ (export 'window-move)
  
 -(defcfun (window-parse-geometry "gtk_window_parse_geometry") :boolean
 +(defcfun (gtk-window-parse-geometry "gtk_window_parse_geometry") :boolean
    (window (g-object gtk-window))
    (geometry-string :string))
  
 -(export 'window-parse-geometry)
 +(export 'gtk-window-parse-geometry)
  
  (defcfun (reshow-window-with-initial-size "gtk_window_reshow_with_initial_size") :void
    (window (g-object gtk-window)))
  
  (export 'reshow-window-with-initial-size)
  
- (defcfun (resize-window "gtk_window_resize") :void
+ (defcfun (window-resize "gtk_window_resize") :void
    (window (g-object gtk-window))
    (width :int)
    (height :int))
  
- (export 'resize-window)
+ (export 'window-resize)
  
- (defcfun (default-window-icon-list "gtk_window_get_default_icon_list") (glist pixbuf))
+ (defcfun (default-window-icon-list "gtk_window_get_default_icon_list") (glist (g-object pixbuf)))
  
  (defcfun (set-default-window-icon-list "gtk_window_set_default_icon_list") :boolean
-   (icon-list (glist pixbuf)))
+   (icon-list (glist (g-object pixbuf))))
  
  (defun (setf default-window-icon-list) (icon-list)
    (set-default-window-icon-list icon-list)
@@@ -238,31 -281,39 +238,39 @@@
  (defcfun (set-default-window-icon-name "gtk_window_set_default_icon_name") :void
    (icon-name :string))
  
- (defun (setf default-window-icon) (icon)
-   (etypecase icon
-     (pixbuf (set-default-window-icon icon))
-     (string (set-default-window-icon-name icon))))
+ (defun (setf window-default-icon) (icon)
+   (set-default-window-icon icon))
  
- (export 'default-window-icon)
+ (defun (setf window-default-icon-name) (name)
+   (set-default-window-icon-name name))
+ 
+ (export 'window-default-icon)
  
  (defcfun (set-window-auto-startup-notification "gtk_window_set_auto_startup_notification") :void
    (setting :boolean))
  
  (export 'set-window-auto-startup-notification)
  
 -(defcfun (window-group-add-window "gtk_window_group_add_window") :void
 +(defcfun (gtk-window-group-add-window "gtk_window_group_add_window") :void
    (window-group (g-object window-group))
    (window (g-object gtk-window)))
  
 -(export 'window-group-add-window)
 +(export 'gtk-window-group-add-window)
  
 -(defcfun (window-group-remove-window "gtk_window_group_remove_window") :void
 +(defcfun (gtk-window-group-remove-window "gtk_window_group_remove_window") :void
    (window-group (g-object window-group))
    (window (g-object gtk-window)))
  
 -(export 'window-group-remove-window)
 +(export 'gtk-window-group-remove-window)
  
 -(defcfun (window-group-list-windows "gtk_window_group_list_windows") (glist gtk-window)
 +(defcfun (gtk-window-group-list-windows "gtk_window_group_list_windows") (glist gtk-window)
    (window-group (g-object window-group)))
  
 -(export 'window-group-list-windows)
 +(export 'gtk-window-group-list-windows)
+ 
 -(defcfun (window-mnemonic-activate "gtk_window_mnemonic_activate") :boolean
++(defcfun (gtk-window-mnemonic-activate "gtk_window_mnemonic_activate") :boolean
+   (window (g-object gtk-window))
+   (keyval :uint)
+   (modifier modifier-type))
+ 
 -(export 'window-mnemonic-activate)
++(export 'gtk-window-mnemonic-activate)