From: Olof-Joachim Frahm <olof@macrolet.net>
Date: Sun, 26 Aug 2012 13:32:23 +0000 (+0200)
Subject: Merge commit 'ae006838093cfeb67b3818526622fb5cb61d5300' of git://github.com/scymtym... 
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=df14f83197720a24523af803ea4d287a677534fb;hp=68787ec2c8d54e4a9d779ce5dbf1cc22e64f440e;p=cl-gtk2.git

Merge commit 'ae006838093cfeb67b3818526622fb5cb61d5300' of git://github.com/scymtym/cl-gtk2
---

diff --git a/cairo/cairo.lisp b/cairo/cairo.lisp
index 4cd1928..41b9b0f 100644
--- a/cairo/cairo.lisp
+++ b/cairo/cairo.lisp
@@ -4,9 +4,9 @@
 
 (defclass gdk-context (cl-cairo2:context)
   ())
-                          
+
 (defun create-gdk-context (gdk-drawable)
-  "creates an context to draw on a GTK widget, more precisely on the
+  "Creates a context to draw on a GTK widget, more precisely on the
 associated gdk-window.  This should only be called from within the
 expose event.  In cells-gtk, use (gtk-adds-widget-window gtk-pointer)
 to obtain the gdk-window. 'gtk-pointer' is the pointer parameter
@@ -61,4 +61,4 @@ to the expose event handler."
   (drawable (g-object drawable)))
 
 (defun gdk-cairo-reset-clip (drawable &optional (context cl-cairo2:*context*))
-  (gdk_cairo_reset_clip (slot-value context 'cl-cairo2:pointer) drawable))
\ No newline at end of file
+  (gdk_cairo_reset_clip (slot-value context 'cl-cairo2:pointer) drawable))
diff --git a/generating.lisp b/generating.lisp
index 34dab49..5115593 100644
--- a/generating.lisp
+++ b/generating.lisp
@@ -70,7 +70,7 @@
                 "GtkTextTagTable" "GtkTreeModelFilter" "GtkTreeModelSort"
                 "GtkTreeSelection" "GtkTreeStore" "GtkUIManager" "GtkWindowGroup"
                 "GtkToggleAction" "GtkRecentAction" "GtkRadioAction" "GtkItemFactory"
-		"GtkPageSetupUnixDialog" "GtkPrintUnixDialog")
+		"GtkPageSetupUnixDialog" "GtkPrintUnixDialog" "GtkInfoBar" "GtkSpinner")
      :flags '("GtkTextSearchFlags" "GtkAccelFlags" "GtkArgFlags" "GtkAttachOptions"
               "GtkButtonAction" "GtkCalendarDisplayOptions" "GtkCellRendererState"
               "GtkDebugFlag" "GtkDestDefaults" "GtkDialogFlags" "GtkFileFilterFlags"
@@ -384,7 +384,12 @@
          "gtk_bin_get_child" nil))
        ("GtkTextChildAnchor"
         (:cffi gtk::deleted-p gtk::text-child-anchor-deleted-p :boolean
-         "gtk_text_child_anchor_get_deleted" nil))))))
+         "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)
@@ -392,4 +397,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)))))
diff --git a/gtk/cl-gtk2-gtk.asd b/gtk/cl-gtk2-gtk.asd
index 1bccf83..7b10475 100644
--- a/gtk/cl-gtk2-gtk.asd
+++ b/gtk/cl-gtk2-gtk.asd
@@ -20,7 +20,7 @@
                (:file "gtk.main_loop_events")
                (:file "gtk.object")
                (:file "gtk.objects")
-               (:file "gtk.generated-classes")               
+               (:file "gtk.generated-classes")
                (:file "gtk.functions")
                (:file "gtk.base-classes")
                (:file "gtk.dialog")
@@ -68,18 +68,21 @@
                (:file "gtk.tree-store")
                (:file "gtk.tree-model-filter")
                (:file "gtk.clipboard")
-               
+               (:file "gtk.info-bar")
+	       (:file "gtk.spinner")
+	       (:file "gtk.markup")
+
                (:file "gtk.main-loop-events")
-               
+
 
                (:file "gtk.generated-child-properties")
-               
+
                (:file "gtk.high-level")
 
                (:file "ui-markup")
 
                (:file "gtk.dialog.example")
-               
+
                (:file "gtk.demo")
                (:file "gtk.timer")
                (:file "gtk.finalize-classes")
diff --git a/gtk/gtk.info-bar.lisp b/gtk/gtk.info-bar.lisp
new file mode 100644
index 0000000..f8910a1
--- /dev/null
+++ b/gtk/gtk.info-bar.lisp
@@ -0,0 +1,15 @@
+(in-package :gtk)
+
+(defcfun (info-bar-add-button "gtk_info_bar_add_button") (g-object widget)
+  (info-bar    (g-object info-bar))
+  (button-text :string)
+  (response-id :int))
+
+(export 'info-bar-add-button)
+
+(defcfun (info-bar-add-action-widget "gtk_info_bar_add_action_widget") :void
+  (info-bar    (g-object info-bar))
+  (widget      (g-object widget))
+  (response-id :int))
+
+(export 'info-bar-add-action-widget)
diff --git a/gtk/gtk.markup.lisp b/gtk/gtk.markup.lisp
new file mode 100644
index 0000000..b574a9b
--- /dev/null
+++ b/gtk/gtk.markup.lisp
@@ -0,0 +1,11 @@
+(in-package :gtk)
+
+(defcfun |g_markup_escape_text| :string
+  (raw  :string)
+  (size :int))
+
+(defun markup-escape-text (raw)
+  (cffi:with-foreign-string (s raw)
+    (|g_markup_escape_text| s (length raw))))
+
+(export 'markup-escape-text)
diff --git a/gtk/gtk.spinner.lisp b/gtk/gtk.spinner.lisp
new file mode 100644
index 0000000..5782858
--- /dev/null
+++ b/gtk/gtk.spinner.lisp
@@ -0,0 +1,9 @@
+(in-package :gtk)
+
+(defcfun (spinner-start "gtk_spinner_start") :void
+  (spinner (g-object gtk:spinner)))
+
+(defcfun (spinner-stop "gtk_spinner_stop") :void
+  (spinner (g-object gtk:spinner)))
+
+(export '(spinner-start spinner-stop))