X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=generating.lisp;h=2bebb7c6ba2f126433225ffc5c46b249b95397e4;hb=HEAD;hp=8b74bd9a318f9092e173a1384be0c6c37436b174;hpb=d51bf2f394c2e3796f2d361b68a9864369aa0950;p=cl-gtk2.git diff --git a/generating.lisp b/generating.lisp index 8b74bd9..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" - "GtkFileSelection" "GtkPageSetupUnixDialog" "GtkPrintUnixDialog") + "GtkPageSetupUnixDialog" "GtkPrintUnixDialog" "GtkInfoBar" "GtkSpinner") :flags '("GtkTextSearchFlags" "GtkAccelFlags" "GtkArgFlags" "GtkAttachOptions" "GtkButtonAction" "GtkCalendarDisplayOptions" "GtkCellRendererState" "GtkDebugFlag" "GtkDestDefaults" "GtkDialogFlags" "GtkFileFilterFlags" @@ -105,7 +104,10 @@ "GtkSubmenuDirection" "GtkSubmenuPlacement" "GtkTextWindowType" "GtkToolbarChildType" "GtkToolbarSpaceStyle" "GtkTreeViewDropPosition" "GtkTreeViewMode" "GtkVisibility" "GtkEntryIconPosition") - :exclusions '("PangoStretch" "PangoVariant" "PangoStyle" "PangoUnderline" "GtkGLDrawingArea") + :exclusions '("PangoStretch" "PangoVariant" "PangoStyle" "PangoUnderline" "GtkGLDrawingArea" + "GtkCList" "GtkCTree" "GtkCombo" "GtkFileSelection" "GtkItemFactory" "GtkList" + "GtkListItem" "GtkOldEditable" "GtkOptionMenu" "GtkPixmap" "GtkPreview" + "GtkText" "GtkTooltips" "GtkTipsQuery" "GtkTree" "GtkTreeItem") :additional-properties '(("GtkWindow" (:cffi gtk::focus gtk::gtk-window-focus (g-object gtk::widget) @@ -119,7 +121,11 @@ (: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)) + "gtk_window_get_group" nil) + (:cffi gtk::keep-above gtk::gtk-window-keep-above :boolean + nil "gtk_window_set_keep_above") + (:cffi gtk::keep-below gtk::gtk-window-keep-below :boolean + nil "gtk_window_set_keep_below")) ("GtkTreeViewColumn" (:cffi gtk::tree-view gtk::tree-view-column-tree-view g-object "gtk_tree_view_column_get_tree_view" nil) @@ -131,7 +137,9 @@ (: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)) + gtk::tree-selection-get-selection-function gtk::tree-selection-set-select-function) + (:cffi gtk::tree-view gtk::tree-selection-tree-view (g-object gtk::tree-view) + "gtk_tree_selection_get_tree_view" nil)) ("GtkTreeView" (:cffi gtk::selection gtk::tree-view-selection g-object "gtk_tree_view_get_selection" nil) @@ -149,15 +157,21 @@ nil gtk::tree-view-set-row-separartor-func)) ("GtkCellView" (:cffi gtk::displayed-row gtk::cell-view-displayed-row (g-boxed-foreign gtk::tree-path) - "gtk_cell_view_get_displayed_row" "gtk_cell_view_set_displayed_row")) + "gtk_cell_view_get_displayed_row" "gtk_cell_view_set_displayed_row") + (:cffi gtk::cell-renderers gtk::cell-view-cell-renderers (glist (g-object gtk::cell-renderer) :free-from-foreign t) + "gtk_cell_view_get_cell_renderers" nil)) ("GtkComboBox" (:cffi gtk::active-iter gtk::combo-box-active-iter (g-boxed-foreign gtk::tree-iter) gtk::combo-box-get-active-iter "gtk_combo_box_set_active_iter") (:cffi gtk::row-separator-func gtk::combo-box-separator-func nil - nil gtk::combo-box-set-separator-func)) + nil gtk::combo-box-set-separator-func) + (:cffi gtk::title gtk::combo-box-title (:string :free-from-foreign nil :free-to-foreign t) + "gtk_combo_box_get_title" "gtk_combo_box_set_title")) ("GtkMenu" (:cffi gtk::screen gtk::menu-screen g-object - nil "gtk_menu_set_screen")) + nil "gtk_menu_set_screen") + (:cffi gtk::title gtk::menu-title (:string :free-from-foreign nil :free-to-foreign t) + "gtk_menu_get_title" "gtk_menu_set_title")) ("GtkToolItem" (:cffi gtk::expand gtk::tool-item-expand :boolean "gtk_tool_item_get_expand" "gtk_tool_item_set_expand") @@ -176,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)) @@ -192,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)) @@ -226,16 +255,20 @@ "gtk_layout_get_bin_window" nil)) ("GtkCalendar" (:cffi gtk::detail-function gtk::calendar-detail-function nil - nil gtk::calendar-set-detail-function)) + nil gtk::calendar-set-detail-function) + (:cffi gtk::display-options gtk::calendar-display-options gtk::calendar-display-options + "gtk_calendar_get_display_options" "gtk_calendar_set_display_options")) ("GtkContainer" (:cffi gtk::focus-child gtk::container-focus-child g-object "gtk_container_get_focus_child" "gtk_container_set_focus_child") (:cffi gtk::focus-vadjustment gtk::container-focus-vadjustment g-object "gtk_container_get_focus_vadjustment" "gtk_container_set_focus_vadjustment") (:cffi gtk::focus-hadjustment gtk::container-focus-hadjustment g-object - "gtk_container_get_focus_hadjustment" "gtk_container_set_focus_hadjustment")) + "gtk_container_get_focus_hadjustment" "gtk_container_set_focus_hadjustment") + (:cffi gtk::reallocate-redraws gtk::container-reallocate-redraws :boolean + nil "gtk_container_set_reallocate_redraws")) ("GtkWidget" - (:cffi gtk::parent-window gtk::widget-parent-window (g-object gdk::window) + (:cffi gtk::parent-window gtk::widget-parent-window (g-object gdk::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) @@ -248,7 +281,7 @@ (: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")) + "gtk_widget_get_child_visible" "gtk_widget_set_child_visible") (:cffi gtk::direction gtk::widget-direction gtk::text-direction "gtk_widget_get_direction" "gtk_widget_set_direction") (:cffi gtk::composite-name gtk::widget-composite-name (glib:g-string :free-from-foreign t :free-to-foreign t) @@ -258,9 +291,11 @@ (: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::window)) + (:cffi gtk::windows gtk::window-group-windows (glist (g-object gtk::gtk-window)) "gtk_window_group_list_windows" nil)) ("GtkTextTag" (:cffi gtk::priority gtk::text-tag-priority :int @@ -308,7 +343,52 @@ (:cffi gtk::entry gtk::entry-completion-entry (g-object gtk::entry) "gtk_entry_completion_get_entry" nil) (:cffi gtk::match-function gtk::entry-completion-match-function nil - nil gtk::gtk-entry-completion-set-match-function)))))) + nil gtk::gtk-entry-completion-set-match-function)) + ("GtkEditable" + (:cffi gtk::position gtk::editable-position :int + "gtk_editable_get_position" "gtk_editable_set_position") + (:cffi gtk::editable gtk::editable-editable :boolean + "gtk_editable_get_editable" "gtk_editable_set_editable")) + ("GtkTextMark" + (:cffi gtk::visible gtk::text-mark-visible :boolean + "gtk_text_mark_get_visible" "gtk_text_mark_set_visible") + (:cffi gtk::deleted gtk::text-mark-deleted :boolean + "gtk_text_mark_get_deleted" nil) + (:cffi gtk::buffer gtk::text-mark-buffer (g-object gtk::text-buffer) + "gtk_text_mark_get_buffer" nil)) + ("GtkTextBuffer" + (:cffi gtk::modified gtk::text-buffer-modified :boolean + "gtk_text_buffer_get_modified" "gtk_text_buffer_set_modified")) + ("GtkToolShell" + (:cffi gtk::icon-size gtk::tool-shell-icon-size gtk::icon-size + "gtk_tool_shell_get_icon_size" nil) + (:cffi gtk::orientation gtk::tool-shell-orientation gtk::orientation + "gtk_tool_shell_get_orientation" nil) + (:cffi gtk::relief-style gtk::tool-shell-relief-style gtk::relief-style + "gtk_tool_shell_get_relief_style" nil) + (:cffi gtk::style gtk::tool-shell-style gtk::toolbar-style + "gtk_tool_shell_get_style" nil)) + ("GtkColorSelection" + (:cffi gtk::previous-alpha gtk::color-selection-previous-alpha :uint16 + "gtk_color_selection_get_previous_alpha" "gtk_color_selection_set_previous_alpha") + (:cffi gtk::previous-color gtk::color-selection-previous-color (g-boxed-foreign gdk::color) + gtk::gtk-color-selection-get-previous-color gtk::gtk-color-selection-set-previous-color)) + ("GtkScrolledWindow" + (:cffi gtk::hscrollbar gtk::scrolled-window-hscrollbar (g-object gtk::widget) + "gtk_scrolled_window_get_hscrollbar" nil) + (:cffi gtk::vscrollbar gtk::scrolled-window-vscrollbar (g-object gtk::widget) + "gtk_scrolled_window_get_vscrollbar" nil)) + ("GtkBin" + (:cffi gtk::child gtk::bin-child (g-object gtk::widget) + "gtk_bin_get_child" nil)) + ("GtkTextChildAnchor" + (:cffi gtk::deleted-p gtk::text-child-anchor-deleted-p :boolean + "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) @@ -316,4 +396,4 @@ (*print-case* :downcase)) (write-string "(in-package :gtk)" stream) (terpri stream) - (format stream "~{~S~%~%~}" (gtk:generate-child-properties))))) \ No newline at end of file + (format stream "~{~S~%~%~}" (gtk:generate-child-properties)))))