X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=generating.lisp;h=2bebb7c6ba2f126433225ffc5c46b249b95397e4;hb=HEAD;hp=8e7624d5bd1fe07cfe3f78e59b614f7af0c879b2;hpb=9e63a758b2df184ec26968b1827db8022eb1149d;p=cl-gtk2.git

diff --git a/generating.lisp b/generating.lisp
index 8e7624d..2bebb7c 100644
--- a/generating.lisp
+++ b/generating.lisp
@@ -50,7 +50,6 @@
                    "GtkCellLayout"
                    "GtkEditable"
                    "GtkFileChooser"
-                   "GtkFileChooserEmbed"
                    "GtkTreeModel"
                    "GtkTreeDragSource"
                    "GtkTreeDragDest"
@@ -70,7 +69,7 @@
                 "GtkTextTagTable" "GtkTreeModelFilter" "GtkTreeModelSort"
                 "GtkTreeSelection" "GtkTreeStore" "GtkUIManager" "GtkWindowGroup"
                 "GtkToggleAction" "GtkRecentAction" "GtkRadioAction" "GtkItemFactory"
-		"GtkPageSetupUnixDialog" "GtkPrintUnixDialog" "GtkInfoBar")
+		"GtkPageSetupUnixDialog" "GtkPrintUnixDialog" "GtkInfoBar" "GtkSpinner")
      :flags '("GtkTextSearchFlags" "GtkAccelFlags" "GtkArgFlags" "GtkAttachOptions"
               "GtkButtonAction" "GtkCalendarDisplayOptions" "GtkCellRendererState"
               "GtkDebugFlag" "GtkDestDefaults" "GtkDialogFlags" "GtkFileFilterFlags"
@@ -191,6 +190,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 +209,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))
@@ -373,7 +387,7 @@
        ("GtkInfoBar"
 	(:cffi gtk::action-area gtk::info-bar-action-area (g-object gtk::widget)
 	 "gtk_info_bar_get_action_area" nil)
-	(:cffi gtk::context-area gtk::info-bar-content-area (g-object gtk::widget)
+	(: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)