From: Ivan Chernetsky Date: Sat, 12 Sep 2009 18:52:58 +0000 (+0300) Subject: Merge branch 'master' into bindings-coverage X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=d6525c49e37c648ea72c38d3218a1c7839ef5991;p=cl-gtk2.git Merge branch 'master' into bindings-coverage Conflicts: generating.lisp gtk/gtk.window.lisp --- d6525c49e37c648ea72c38d3218a1c7839ef5991 diff --cc generating.lisp index 98f5f37,44b404b..5a1dbd5 --- a/generating.lisp +++ b/generating.lisp @@@ -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 --cc gtk/gtk.window.lisp index 311854e,d67bbbf..85867f5 --- a/gtk/gtk.window.lisp +++ b/gtk/gtk.window.lisp @@@ -78,47 -104,47 +78,47 @@@ (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)) @@@ -188,22 -226,27 +188,22 @@@ (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)) @@@ -260,9 -304,16 +261,16 @@@ (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)