Merge branch 'master' of git://github.com/dmitryvk/cl-gtk2

[cl-gtk2.git] / generating.lisp

diff --git a/generating.lisp b/generating.lisp
index 45d4723..34dab49 100644 (file)
--- a/generating.lisp
+++ b/generating.lisp
@@ -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))
@@ -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))
@@ -277,7 +292,9 @@
         (: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"))
+        "gtk_widget_get_tooltip_window" "gtk_widget_set_tooltip_window")
+        (:cffi gtk::style gtk::widget-style (g-object gtk::style)
+         "gtk_widget_get_style" "gtk_widget_set_style"))
        ("GtkWindowGroup"
         (:cffi gtk::windows gtk::window-group-windows (glist (g-object gtk::gtk-window))
          "gtk_window_group_list_windows" nil))
@@ -364,7 +381,10 @@
          "gtk_scrolled_window_get_vscrollbar" nil))
        ("GtkBin"
         (:cffi gtk::child gtk::bin-child (g-object gtk::widget)
-         "gtk_bin_get_child" nil))))))
+         "gtk_bin_get_child" nil))
+       ("GtkTextChildAnchor"
+        (:cffi gtk::deleted-p gtk::text-child-anchor-deleted-p :boolean
+         "gtk_text_child_anchor_get_deleted" nil))))))
 
 (defun gtk-generate-child-properties (filename)
   (with-open-file (stream filename :direction :output :if-exists :supersede)