Merge commit 'ae006838093cfeb67b3818526622fb5cb61d5300' of git://github.com/scymtym...

diff --combined generating.lisp
index 34dab49,16ee694..5115593
--- 1/generating.lisp
--- 2/generating.lisp
+++ b/generating.lisp
@@@ -70,7 -70,7 +70,7 @@@
                  "GtkTextTagTable" "GtkTreeModelFilter" "GtkTreeModelSort"
                  "GtkTreeSelection" "GtkTreeStore" "GtkUIManager" "GtkWindowGroup"
                  "GtkToggleAction" "GtkRecentAction" "GtkRadioAction" "GtkItemFactory"
-               "GtkPageSetupUnixDialog" "GtkPrintUnixDialog")
+               "GtkPageSetupUnixDialog" "GtkPrintUnixDialog" "GtkInfoBar" "GtkSpinner")
       :flags '("GtkTextSearchFlags" "GtkAccelFlags" "GtkArgFlags" "GtkAttachOptions"
                "GtkButtonAction" "GtkCalendarDisplayOptions" "GtkCellRendererState"
                "GtkDebugFlag" "GtkDestDefaults" "GtkDialogFlags" "GtkFileFilterFlags"
@@@ -191,9 -191,6 +191,9 @@@
           nil "gtk_menu_tool_button_set_arrow_tooltip_text")
          (:cffi gtk::arrow-tooltip-markup gtk::menu-tool-button-arrow-tooltip-markup :string
           nil "gtk_menu_tool_button_set_arrow_tooltip_markup"))
 +       ("GtkRadioButton"
 +        (:cffi gtk::group gtk::radio-button-group (gslist gtk::radio-button :free-from-foreign nil :free-to-foreign nil)
 +         nil "gtk_radio_button_set_group"))
         ("GtkUIManager"
          (:cffi gtk::accel-group gtk::ui-manager-accel-group g-object
           "gtk_ui_manager_get_accel_group" nil))
@@@ -210,27 -207,15 +210,27 @@@
         ("GtkFileChooser"
          (:cffi gtk::current-name gtk::file-chooser-current-name (:string :free-to-foreign t :encoding :utf-8)
           nil "gtk_file_chooser_set_current_name")
 -        (:cffi gtk::filename gtk::file-chooser-filename (glib:g-string :free-from-foreign t :free-to-foreign t)
 +        (:cond :+win32
 +         :cffi gtk::filename gtk::file-chooser-filename (glib:g-string :free-from-foreign t :free-to-foreign t)
 +         "gtk_file_chooser_get_filename_utf8" "gtk_file_chooser_set_filename_utf8")
 +        (:cond :-win32
 +         :cffi gtk::filename gtk::file-chooser-filename (glib:g-string :free-from-foreign t :free-to-foreign t)
           "gtk_file_chooser_get_filename" "gtk_file_chooser_set_filename")
 -        (:cffi gtk::current-folder gtk::file-chooser-current-folder (glib:g-string :free-from-foreign t :free-to-foreign t)
 +        (:cond :+win32
 +         :cffi gtk::current-folder gtk::file-chooser-current-folder (glib:g-string :free-from-foreign t :free-to-foreign t)
 +         "gtk_file_chooser_get_current_folder_utf8" "gtk_file_chooser_set_current_folder_utf8")
 +        (:cond :-win32
 +         :cffi gtk::current-folder gtk::file-chooser-current-folder (glib:g-string :free-from-foreign t :free-to-foreign t)
           "gtk_file_chooser_get_current_folder" "gtk_file_chooser_set_current_folder")
          (:cffi gtk::uri gtk::file-chooser-uri (glib:g-string :free-from-foreign t :free-to-foreign t)
           "gtk_file_chooser_get_uri" "gtk_file_chooser_set_uri")
          (:cffi gtk::current-folder-uri gtk::file-chooser-current-folder-uri (glib:g-string :free-from-foreign t :free-to-foreign t)
           "gtk_file_chooser_get_current_folder_uri" "gtk_file_chooser_set_current_folder_uri")
 -        (:cffi gtk::preview-filename gtk::file-chooser-preview-filename (glib:g-string :free-from-foreign t :free-to-foreign t)
 +        (:cond :+win32
 +         :cffi gtk::preview-filename gtk::file-chooser-preview-filename (glib:g-string :free-from-foreign t :free-to-foreign t)
 +         "gtk_file_chooser_get_preview_filename_utf8" nil)
 +        (:cond :-win32
 +         :cffi gtk::preview-filename gtk::file-chooser-preview-filename (glib:g-string :free-from-foreign t :free-to-foreign t)
           "gtk_file_chooser_get_preview_filename" nil)
          (:cffi gtk::preview-uri gtk::file-chooser-preview-uri (glib:g-string :free-from-foreign t :free-to-foreign t)
           "gtk_file_chooser_get_preview_uri" nil))
@@@ -384,7 -369,12 +384,12 @@@
           "gtk_bin_get_child" nil))
         ("GtkTextChildAnchor"
          (:cffi gtk::deleted-p gtk::text-child-anchor-deleted-p :boolean
-          "gtk_text_child_anchor_get_deleted" nil))))))
+          "gtk_text_child_anchor_get_deleted" nil))
+        ("GtkInfoBar"
+       (:cffi gtk::action-area gtk::info-bar-action-area (g-object gtk::widget)
+        "gtk_info_bar_get_action_area" nil)
+       (:cffi gtk::content-area gtk::info-bar-content-area (g-object gtk::widget)
+        "gtk_info_bar_get_content_area" nil))))))
  
  (defun gtk-generate-child-properties (filename)
    (with-open-file (stream filename :direction :output :if-exists :supersede)
@@@ -392,4 -382,4 +397,4 @@@
            (*print-case* :downcase))
       (write-string "(in-package :gtk)" stream)
       (terpri stream)
-      (format stream "~{~S~%~%~}" (gtk:generate-child-properties)))))
+      (format stream "~{~S~%~%~}" (gtk:generate-child-properties)))))

diff --combined gtk/cl-gtk2-gtk.asd
index 1bccf83,6eaf650..7b10475
--- 1/gtk/cl-gtk2-gtk.asd
--- 2/gtk/cl-gtk2-gtk.asd
+++ b/gtk/cl-gtk2-gtk.asd
@@@ -20,11 -20,10 +20,11 @@@
                 (:file "gtk.main_loop_events")
                 (:file "gtk.object")
                 (:file "gtk.objects")
-                (:file "gtk.generated-classes")               
+                (:file "gtk.generated-classes")
                 (:file "gtk.functions")
                 (:file "gtk.base-classes")
                 (:file "gtk.dialog")
 +               (:file "gtk.about-dialog")
                 (:file "gtk.window")
                 (:file "gtk.window-group")
                 (:file "gtk.icon-factory")
@@@ -60,7 -59,6 +60,7 @@@
                 (:file "gtk.paned")
                 (:file "gtk.child-properties")
                 (:file "gtk.widget")
 +               (:file "gtk.tree-view-dnd")
                 (:file "gtk.builder")
                 (:file "gtk.assistant")
                 (:file "gtk.link-button")
@@@ -68,18 -66,21 +68,21 @@@
                 (:file "gtk.tree-store")
                 (:file "gtk.tree-model-filter")
                 (:file "gtk.clipboard")
-                
+                (:file "gtk.info-bar")
+              (:file "gtk.spinner")
+              (:file "gtk.markup")
+ 
                 (:file "gtk.main-loop-events")
-                
+ 
  
                 (:file "gtk.generated-child-properties")
-                
+ 
                 (:file "gtk.high-level")
  
                 (:file "ui-markup")
  
                 (:file "gtk.dialog.example")
-                
+ 
                 (:file "gtk.demo")
                 (:file "gtk.timer")
                 (:file "gtk.finalize-classes")