X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/163a08aaebb6e359197448da3358c95ea4f2f7c2..6ac8ef4748d38d2a3fe1c24d311090e4d6187230:/gtk/gtktypes.lisp?ds=sidebyside

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index 8e0fb81..61816b4 100644
--- a/gtk/gtktypes.lisp
+++ b/gtk/gtktypes.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gtktypes.lisp,v 1.40 2006-02-04 12:18:12 espen Exp $
+;; $Id: gtktypes.lisp,v 1.45 2006-02-26 23:37:18 espen Exp $
 
 (in-package "GTK")
 
@@ -136,8 +136,16 @@
 (deftype position () 
   '(or int (enum (:start 0) (:end -1) (:first 0) (:last -1))))
 
-(defmethod reader-function ((type (eql 'position)) &rest args)
-  (declare (ignore type args))
+(define-type-method from-alien-form ((type position) form)
+  (declare (ignore type))
+  (from-alien-form 'int form))
+
+(define-type-method from-alien-function ((type position))
+  (declare (ignore type))
+  (from-alien-function 'int))
+
+(define-type-method reader-function ((type position))
+  (declare (ignore type))
   (reader-function 'int))
 
 
@@ -155,7 +163,7 @@
   ("GtkWidget"
    :slots
    ((child-properties
-     :allocation :special
+     :special t
      :accessor widget-child-properties
      :type container-child)
     (window
@@ -307,7 +315,7 @@
      :type boolean)
     (icon-list
      :allocation :virtual
-     :getter "gtk_window_get_icon_list"
+     :getter %window-get-icon-list
      :setter "gtk_window_set_icon_list"
      :accessor window-icon-list
      :initarg :icon-list
@@ -487,6 +495,22 @@
      :initarg :tearoff-state
      :type boolean)))
 
+  ("GtkPlug"
+   :slots
+   ((id
+     :allocation :virtual
+     :getter "gtk_plug_get_id"
+     :reader plug-id
+     :type gdk:native-window)))
+
+  ("GtkSocket"
+   :slots
+   ((id
+     :allocation :virtual
+     :getter "gtk_socket_get_id"
+     :reader socket-id
+     :type gdk:native-window)))
+
   ("GtkToolbar"
    :slots
    ((show-tooltips
@@ -1183,7 +1207,6 @@
   :no-drop :drop-into :drop-left :drop-right :drop-above :drop-below)
 
 
-
 (defclass target-entry (struct)
   ((target
     :allocation :alien
@@ -1202,4 +1225,32 @@
     :type unsigned-int))
   (:metaclass struct-class))
 
-(deftype target-list () 'pointer)
+
+(defclass selection-data (boxed)
+  ((selection
+    :allocation :alien :type gdk:atom
+    :reader selection-data-selection)
+   (target
+    :allocation :alien :type gdk:atom
+    :reader selection-data-target)
+   (type
+    :allocation :alien :type gdk:atom
+    :reader selection-data-type)
+   (format 
+    :allocation :alien :type int
+    :reader selection-data-format)
+   (data
+    :allocation :alien :type pointer
+    :reader selection-data-data)
+   (length 
+    :allocation :alien :type int
+    :reader selection-data-length)
+   (display 
+    :allocation :alien :type gdk:display
+    :reader selection-data-display))
+  (:metaclass boxed-class))
+
+
+(defclass target-list (proxy)
+  ()
+  (:metaclass proxy-class))