Port from toolbar-orientation to orientable-orientation

[clg] / examples / testgtk.lisp

diff --git a/examples/testgtk.lisp b/examples/testgtk.lisp
index 858d894..04047c2 100644 (file)
--- a/examples/testgtk.lisp
+++ b/examples/testgtk.lisp
@@ -23,10 +23,11 @@
 ;; Parts of this file are direct translations of code from 'testgtk.c'
 ;; distributed with the Gtk+ library, and thus covered by the GNU
 ;; Lesser General Public License and copyright Peter Mattis, Spencer
-;; Kimball, Josh MacDonald and others.
+;; Kimball, Josh MacDonald and others. To be safe the entire file
+;; should probably be considered as being GPL'ed.
 
 
-;; $Id: testgtk.lisp,v 1.41 2007-07-12 09:18:30 espen Exp $
+;; $Id: testgtk.lisp,v 1.44 2008-12-09 19:37:19 espen Exp $
 
 #+sbcl(require :gtk)
 #+(or cmu clisp)(asdf:oos 'asdf:load-op :gtk)
@@ -950,8 +951,8 @@ This one is underlined in quite a funky fashion"
        
 (define-simple-dialog create-notebook (dialog "Notebook")
   (let ((main (make-instance 'v-box :parent dialog)))
-    (let ((book-open (gdk:pixbuf-new-from-xpm-data book-open-xpm))
-         (book-closed (gdk:pixbuf-new-from-xpm-data book-closed-xpm))
+    (let ((book-open (make-instance 'gdk:pixbuf :source book-open-xpm))
+         (book-closed (make-instance 'gdk:pixbuf :source book-closed-xpm))
          (notebook (make-instance 'notebook 
                     :border-width 10 :tab-pos :top :parent main)))
 
@@ -1701,7 +1702,7 @@ This one is underlined in quite a funky fashion"
           :tip-private "Toolbar/Horizontal"
           :signal (list 'clicked 
                    #'(lambda (toolbar) 
-                       (setf (toolbar-orientation toolbar) :horizontal))
+                       (setf (orientable-orientation toolbar) :horizontal))
                    :object :parent))
 
    :child (make-instance 'tool-button
@@ -1710,7 +1711,7 @@ This one is underlined in quite a funky fashion"
           :tip-private "Toolbar/Vertical"
           :signal (list 'clicked 
                    #'(lambda (toolbar) 
-                       (setf (toolbar-orientation toolbar) :vertical))
+                       (setf (orientable-orientation toolbar) :vertical))
                    :object :parent))
 
    :child (make-instance 'separator-tool-item)
@@ -1795,7 +1796,7 @@ This one is underlined in quite a funky fashion"
    :child (create-label "Below")))
 
 
-;;; Tooltips test
+;;; Tooltips test. Note that GtkTooltips has been deprecated in GTK+ 2.12
 
 (define-simple-dialog create-tooltips (dialog "Tooltips" :default-width 200)
   (let ((tooltips (make-instance 'tooltips)))
@@ -1919,7 +1920,7 @@ This one is underlined in quite a funky fashion"
            ("cursors" create-cursors)
            ("dialog" create-dialog)
            ("entry" create-entry)
-           ("enxpander" create-expander)
+           ("expander" create-expander)
            ("file chooser" create-file-chooser)
            ("font selection" create-font-selection)
            ("handle box" create-handle-box)