define-g-boxed-*: generate predictable names for structures

[cl-gtk2.git] / generating.lisp

diff --git a/generating.lisp b/generating.lisp
index f01bb95..bf3bd5a 100644 (file)
--- a/generating.lisp
+++ b/generating.lisp
@@ -70,7 +70,7 @@
                 "GtkTextTagTable" "GtkTreeModelFilter" "GtkTreeModelSort"
                 "GtkTreeSelection" "GtkTreeStore" "GtkUIManager" "GtkWindowGroup"
                 "GtkToggleAction" "GtkRecentAction" "GtkRadioAction" "GtkItemFactory"
-               "GtkFileSelection" "GtkPageSetupUnixDialog" "GtkPrintUnixDialog")
+               "GtkPageSetupUnixDialog" "GtkPrintUnixDialog")
      :flags '("GtkTextSearchFlags" "GtkAccelFlags" "GtkArgFlags" "GtkAttachOptions"
               "GtkButtonAction" "GtkCalendarDisplayOptions" "GtkCellRendererState"
               "GtkDebugFlag" "GtkDestDefaults" "GtkDialogFlags" "GtkFileFilterFlags"
@@ -105,7 +105,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 +122,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)
@@ -235,7 +242,7 @@
         (:cffi gtk::focus-hadjustment gtk::container-focus-hadjustment g-object
          "gtk_container_get_focus_hadjustment" "gtk_container_set_focus_hadjustment"))
        ("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)
@@ -260,7 +267,7 @@
         (:cffi gtk::tooltip-window gtk::widget-tooltip-window g-object
         "gtk_widget_get_tooltip_window" "gtk_widget_set_tooltip_window"))
        ("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 +315,22 @@
         (: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"))))))
 
 (defun gtk-generate-child-properties (filename)
   (with-open-file (stream filename :direction :output :if-exists :supersede)