From 8dc9ba4cf32b35d371a491f955cdd621a10ff327 Mon Sep 17 00:00:00 2001 From: Dmitry Kalyanov Date: Sun, 13 Sep 2009 16:58:35 +0400 Subject: [PATCH] Fix typos; add GtkEntryIconPosition enum to generating --- generating.lisp | 4 ++-- gtk/gtk.demo.lisp | 14 +++++++------- gtk/gtk.generated-classes.lisp | 6 +++++- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/generating.lisp b/generating.lisp index 50aca1b..7ff0f82 100644 --- a/generating.lisp +++ b/generating.lisp @@ -103,7 +103,7 @@ "GtkScrollStep" "GtkScrollType" "GtkSideType" "GtkSpinType" "GtkSubmenuDirection" "GtkSubmenuPlacement" "GtkTextWindowType" "GtkToolbarChildType" "GtkToolbarSpaceStyle" "GtkTreeViewDropPosition" - "GtkTreeViewMode" "GtkVisibility") + "GtkTreeViewMode" "GtkVisibility" "GtkEntryIconPosition") :exclusions '("PangoStretch" "PangoVariant" "PangoStyle" "PangoUnderline" "GtkGLDrawingArea") :additional-properties '(("GtkTreeViewColumn" @@ -195,7 +195,7 @@ (:cffi gtk::forward-page-function gtk::assistant-forward-page-function nil nil gtk::set-assistant-forward-page-function)) ("GtkLabel" (:cffi gtk::line-wrap gtk::label-line-wrap :boolean "gtk_label_get_line_wrap" "gtk_label_set_line_wrap") - (:cffi gtk::line-wrap-mode gtk::label-line-wrap-mode gtk::pango-wrap-mode "gtk_label_line_wrap_mode" "gtk_label_set_line_wrap_mode") + (:cffi gtk::line-wrap-mode gtk::label-line-wrap-mode gtk::pango-wrap-mode "gtk_label_get_line_wrap_mode" "gtk_label_set_line_wrap_mode") (:cffi gtk::layout gtk::label-layout g-object "gtk_label_get_layout" nil) (:cffi gtk::selection-bounds gtk::label-selection-bounds nil gtk::gtk-label-get-selection-bounds nil) (:cffi gtk::layout-offsets gtk::label-layout-offsets nil gtk::gtk-label-get-layout-offsets nil)) diff --git a/gtk/gtk.demo.lisp b/gtk/gtk.demo.lisp index 6d2f59c..35511fc 100644 --- a/gtk/gtk.demo.lisp +++ b/gtk/gtk.demo.lisp @@ -533,9 +533,9 @@ #+nil(print (current-event)) (setf (text-buffer-text (text-view-buffer text-view)) (format nil "Clicked ~A times~%" (incf c))) - (status-bar-pop (builder-get-object builder "statusbar1") + (statusbar-pop (builder-get-object builder "statusbar1") "times") - (status-bar-push (builder-get-object builder "statusbar1") + (statusbar-push (builder-get-object builder "statusbar1") "times" (format nil "~A times" c)))) ("quit_cb" ,(lambda (&rest args) @@ -551,7 +551,7 @@ (dialog-run d) (object-destroy d))))))) (g-signal-connect (builder-get-object builder "window1") "destroy" (lambda (w) (declare (ignore w)) (leave-gtk-main))) - (status-bar-push (builder-get-object builder "statusbar1") "times" "0 times") + (statusbar-push (builder-get-object builder "statusbar1") "times" "0 times") (widget-show (builder-get-object builder "window1"))))) (defun read-text-file (file-name) @@ -570,13 +570,13 @@ builder)) (window (builder-get-object builder "window1")) (text-view (builder-get-object builder "textview1")) - (status-bar (builder-get-object builder "statusbar1")) + (statusbar (builder-get-object builder "statusbar1")) (file-name nil) (modified-p t)) - (status-bar-push status-bar "filename" "Untitled *") + (statusbar-push statusbar "filename" "Untitled *") (labels ((set-properties () - (status-bar-pop status-bar "filename") - (status-bar-push status-bar "filename" (format nil "~A~:[~; *~]" (or file-name "Untitled") modified-p))) + (statusbar-pop statusbar "filename") + (statusbar-push statusbar "filename" (format nil "~A~:[~; *~]" (or file-name "Untitled") modified-p))) (new (&rest args) (declare (ignore args)) (setf file-name nil modified-p t diff --git a/gtk/gtk.generated-classes.lisp b/gtk/gtk.generated-classes.lisp index 768a6c7..98c0767 100644 --- a/gtk/gtk.generated-classes.lisp +++ b/gtk/gtk.generated-classes.lisp @@ -430,6 +430,10 @@ (:export t :type-initializer "gtk_visibility_get_type") (:none 0) (:partial 1) (:full 2)) +(define-g-enum "GtkEntryIconPosition" entry-icon-position + (:export t :type-initializer "gtk_entry_icon_position_get_type") + (:primary 0) (:secondary 1)) + (define-g-flags "GtkTextSearchFlags" text-search-flags (:export t :type-initializer "gtk_text_search_flags_get_type") (:visible-only 1) (:text-only 2)) @@ -2235,7 +2239,7 @@ (:cffi line-wrap label-line-wrap :boolean "gtk_label_get_line_wrap" "gtk_label_set_line_wrap") (:cffi line-wrap-mode label-line-wrap-mode - pango-wrap-mode "gtk_label_line_wrap_mode" + pango-wrap-mode "gtk_label_get_line_wrap_mode" "gtk_label_set_line_wrap_mode") (:cffi layout label-layout g-object "gtk_label_get_layout" nil) -- 1.7.10.4