String manually converted to utf8 in CMUCL, and a couple of bug fixes

diff --git a/examples/testgtk.lisp b/examples/testgtk.lisp
index b688c166ecf11d73bb03f9925c3f9a5053b7d6f0..83a2b95138932d9d2ac32caccf4993c4e1f343d4 100644 (file)
--- a/examples/testgtk.lisp
+++ b/examples/testgtk.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 

-;; $Id: testgtk.lisp,v 1.25 2005-03-13 18:16:08 espen Exp $
+;; $Id: testgtk.lisp,v 1.26 2005-04-17 21:52:17 espen Exp $

 
 (defpackage "TESTGTK"
   (:use "COMMON-LISP" "GTK"))
 
 (defpackage "TESTGTK"
   (:use "COMMON-LISP" "GTK"))


@@ -326,7 +326,7 @@ (define-simple-dialog create-cursors (dialog "Cursors")
   (let ((spinner (make-instance 'spin-button 
                  :adjustment (adjustment-new 
                               0 0 
   (let ((spinner (make-instance 'spin-button 
                  :adjustment (adjustment-new 
                               0 0 

-                              (1- (enum-int :last-cursor 'gdk:cursor-type))
+                              (1- (glib:enum-int :last-cursor 'gdk:cursor-type))

                               2 10 0)))
        (drawing-area (make-instance 'drawing-area
                       :width-request 80 :height-request 80
                               2 10 0)))
        (drawing-area (make-instance 'drawing-area
                       :width-request 80 :height-request 80


@@ -667,8 +667,9 @@ (define-toplevel create-labels (window "Labels" :border-width 5 :resizable nil)
                       :justify :fill :wrap t)
 
             :child (create-label-in-frame "Underlined label"
                       :justify :fill :wrap t)
 
             :child (create-label-in-frame "Underlined label"

+(#+cmu glib:latin1-to-unicode #+sbcl identity

 "This label is underlined!
 "This label is underlined!

-This one is underlined (こんにちは) in quite a funky fashion"
+This one is underlined (æøåÆØÅ) in quite a funky fashion")

                       :justify :left
                      :pattern  "_________________________ _ _________ _ _____ _ __ __  ___ ____ _____")))))
 
                       :justify :left
                      :pattern  "_________________________ _ _________ _ _____ _ __ __  ___ ____ _____")))))
 


@@ -733,7 +734,7 @@ (define-toplevel create-layout (window "Layout" :default-width 200
     
 (define-simple-dialog create-list (dialog "List" :default-height 400)
   (let* ((store (make-instance 'list-store 
     
 (define-simple-dialog create-list (dialog "List" :default-height 400)
   (let* ((store (make-instance 'list-store 

-                :column-types '(string int boolean)
+                :column-types '(string integer boolean)

                 :column-names '(:foo :bar :baz)
                 :initial-content '(#("First" 12321 nil)
                                    (:foo "Yeah" :baz t))))
                 :column-names '(:foo :bar :baz)
                 :initial-content '(#("First" 12321 nil)
                                    (:foo "Yeah" :baz t))))