Merge branch 'master' into andy128kr

diff --combined gdk/cl-gtk2-gdk.asd
index 2869ef4,8ca6916..3c7c2cc
--- 1/gdk/cl-gtk2-gdk.asd
--- 2/gdk/cl-gtk2-gdk.asd
+++ b/gdk/cl-gtk2-gdk.asd
@@@ -1,6 -1,6 +1,6 @@@
  (defsystem :cl-gtk2-gdk
    :name :cl-gtk2-gdk
-   :version "0.1"
+   :version "0.1.1"
    :author "Kalyanov Dmitry <Kalyanov.Dmitry@gmail.com>"
    :license "LLGPL"
    :serial t
@@@ -28,4 -28,4 +28,4 @@@
                 (:file "gdk.drag-and-drop")
                 (:file "gdk.input-devices")
                 (:file "gdk.pango"))
 -  :depends-on (:cl-gtk2-glib :cffi :cl-gtk2-pango))
 +  :depends-on (:cl-gtk2-glib :cffi :cl-gtk2-pango))

diff --combined gtk/cl-gtk2-gtk.asd
index 0672a17,78525d4..e548b8c
--- 1/gtk/cl-gtk2-gtk.asd
--- 2/gtk/cl-gtk2-gtk.asd
+++ b/gtk/cl-gtk2-gtk.asd
@@@ -1,6 -1,17 +1,17 @@@
+ (defpackage #:cl-gtk2-gtk-system
+   (:use #:cl #:asdf))
+ 
+ (in-package #:cl-gtk2-gtk-system)
+ 
+ (defclass plain-file (static-file)
+   ((type :initarg :type :reader plain-file-type :initform nil)))
+ 
+ (defmethod source-file-type ((c plain-file) (s module))
+   (plain-file-type c))
+ 
  (defsystem :cl-gtk2-gtk
    :name :cl-gtk2-gtk
-   :version "0.1"
+   :version "0.1.1"
    :author "Kalyanov Dmitry <Kalyanov.Dmitry@gmail.com>"
    :license "LLGPL"
    :serial t
@@@ -15,7 -26,6 +26,7 @@@
                 (:file "gtk.dialog")
                 (:file "gtk.window")
                 (:file "gtk.window-group")
 +               (:file "gtk.icon-factory")
                 (:file "gtk.image")
                 (:file "gtk.label")
                 (:file "gtk.progress-bar")
@@@ -24,8 -34,6 +35,8 @@@
                 (:file "gtk.scale-button")
                 (:file "gtk.entry")
                 (:file "gtk.spin-button")
 +               (:file "gtk.selections")
 +               (:file "gtk.dnd")
                 (:file "gtk.text")
                 (:file "gtk.tree-model")
                 (:file "gtk.tree-view-column")
@@@ -68,9 -76,7 +79,7 @@@
                 (:file "gtk.demo")
                 (:file "gtk.timer")
                 (:module "demo-files"
-                         :pathname "demo"
-                         :components ((:static-file "demo1.glade")
-                                      (:static-file "demo1.ui")
-                                      (:static-file "text-editor.glade")
-                                      (:static-file "text-editor.ui"))))
+                         :pathname "demo/"
+                         :components ((:plain-file "demo1" :type "ui")
+                                      (:plain-file "text-editor" :type "ui"))))
    :depends-on (:cl-gtk2-glib :cffi :cl-gtk2-gdk :bordeaux-threads :iterate :cl-gtk2-pango))

diff --combined gtk/gtk.widget.lisp
index 6532f11,bd5ffe8..622ab8e
--- 1/gtk/gtk.widget.lisp
--- 2/gtk/gtk.widget.lisp
+++ b/gtk/gtk.widget.lisp
@@@ -2,17 -2,6 +2,17 @@@
  
  ; TODO: GtkWidget
  
 +(define-g-boxed-cstruct selection-data "GtkSelectionData"
 +  (selection :pointer) ; GdkAtom
 +  (target :pointer) ; GdkAtom
 +  (type :pointer) ; GdkAtom
 +  (format :int)
 +  (data :pointer :initform 0)
 +  (length :int)
 +  (display g-object))
 +
 +(export (boxed-related-symbols 'selection-data))
 +
  (defun widget-flags (widget)
    (convert-from-foreign (gtk-object-flags-as-integer widget) 'widget-flags))
  
@@@ -26,8 -15,8 +26,8 @@@
  (defcstruct %gtk-widget
    (:object %gtk-object)
    (:private-flags :uint16)
-   (:state state-type)
-   (:saved-state state-type)
+   (:state :uint8)
+   (:saved-state :uint8)
    (:name (:pointer :char))
    (:style :pointer)
    (:requisition requisition-cstruct)
@@@ -36,12 -25,12 +36,12 @@@
    (:parent :pointer))
  
  (defun widget-state (widget)
-   (foreign-slot-value (pointer widget) '%gtk-widget :state))
+   (convert-from-foreign (foreign-slot-value (pointer widget) '%gtk-widget :state) 'state-type))
  
  (export 'widget-state)
  
  (defun widget-saved-state (widget)
-   (foreign-slot-value (pointer widget) '%gtk-widget :saved-state))
+   (convert-from-foreign (foreign-slot-value (pointer widget) '%gtk-widget :saved-state) 'state-type))
  
  (export 'widget-saved-state)
  
@@@ -637,4 -626,4 +637,4 @@@
  (defun widget-snapshot (widget &optional clip-rectangle)
    (gtk-widget-get-snapshot widget clip-rectangle))
  
 -(export 'widget-snapshot)
 +(export 'widget-snapshot)