From 3e4cced16412a02087a3935ed9ad3e073a4138e6 Mon Sep 17 00:00:00 2001
From: Dmitry Kalyanov <Kalyanov.Dmitry@gmail.com>
Date: Mon, 18 Jan 2010 23:29:30 +0300
Subject: [PATCH] Changed patch to conform

---
 gtk/gtk.cell-renderer.lisp |   13 +++++--------
 gtk/gtk.dnd.lisp           |   14 ++------------
 gtk/gtk.tree-view.lisp     |   12 ++++++------
 gtk/gtk.widget.lisp        |   14 +++++++-------
 4 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/gtk/gtk.cell-renderer.lisp b/gtk/gtk.cell-renderer.lisp
index 4de7f00..25dda52 100644
--- a/gtk/gtk.cell-renderer.lisp
+++ b/gtk/gtk.cell-renderer.lisp
@@ -15,9 +15,9 @@
 ; TODO: gtk_cell_renderer_stop_editing
 
 (defcfun gtk-cell-renderer-get-fixed-size :void
-  (cell g-object)
-  (width :pointer)
-  (height :pointer))
+  (cell (g-object cell-renderer))
+  (width (:pointer :int))
+  (height (:pointer :int)))
 
 (defun cell-renderer-get-fixed-size (cell)
   (with-foreign-objects ((width :int) (height :int))
@@ -27,14 +27,11 @@
 
 (export 'cell-renderer-get-fixed-size)
 
-(defcfun gtk-cell-renderer-set-fixed-size :void
-  (cell g-object)
+(defcfun (cell-renderer-set-fixed-size "gtk_cell_renderer_set_fixed_size") :void
+  (cell (g-object cell-renderer))
   (width :int)
   (height :int))
 
-(defun cell-renderer-set-fixed-size (cell width height)
-  (gtk-cell-renderer-set-fixed-size cell width height))
-
 (export 'cell-renderer-set-fixed-size)
 
 ; TODO: GtkCellRendererAccel
diff --git a/gtk/gtk.dnd.lisp b/gtk/gtk.dnd.lisp
index cfb504b..0470321 100644
--- a/gtk/gtk.dnd.lisp
+++ b/gtk/gtk.dnd.lisp
@@ -1,20 +1,10 @@
 (in-package :gtk)
 
-(define-g-flags "GtkTargetFlags" target-flags
-    (:export t :type-initializer "gtk_target_flags_get_type")
-  (:same-app 1)
-  (:same-widget 2)
-  (:other-app 4)
-  (:other-widget 8))
-
-(defcfun gtk-drag-finish :void
-  (context g-object)
+(defcfun (drag-finish "gtk_drag_finish") :void
+  (context (g-object drag-context))
   (success :boolean)
   (del :boolean)
   (time :uint32))
 
-(defun drag-finish (context success del time)
-  (gtk-drag-finish context success del time))
-
 (export 'drag-finish)
 
diff --git a/gtk/gtk.tree-view.lisp b/gtk/gtk.tree-view.lisp
index 50efebc..6c47567 100644
--- a/gtk/gtk.tree-view.lisp
+++ b/gtk/gtk.tree-view.lisp
@@ -325,10 +325,10 @@
 (export 'tree-view-convert-widget-to-tree-coords)
 
 (defcfun gtk-tree-view-enable-model-drag-dest :void
-  (tree-view g-object)
+  (tree-view (g-object tree-view))
   (targets :pointer)
   (n-targets :int)
-  (actions gdk:drag-action))
+  (actions gdk-drag-action))
 
 (defun tree-view-enable-model-drag-dest (tree-view targets actions)
   (with-foreign-boxed-array (n-targets targets-ptr target-entry targets)
@@ -337,11 +337,11 @@
 (export 'tree-view-enable-model-drag-dest)
 
 (defcfun gtk-tree-view-enable-model-drag-source :void
-  (tree-view g-object)
-  (start-button-mask gdk:modifier-type)
+  (tree-view (g-object tree-view))
+  (start-button-mask modifier-type)
   (targets :pointer)
   (n-targets :int)
-  (actions gdk:drag-action))
+  (actions gdk-drag-action))
 
 (defun tree-view-enable-model-drag-source (tree-view start-button-mask targets actions)
   (with-foreign-boxed-array (n-targets targets-ptr target-entry targets)
@@ -358,7 +358,7 @@
 ; TOOD: gtk_tree_view_get_drag_dest_row
 
 (defcfun gtk-tree-view-get-dest-row-at-pos :boolean
-  (tree_view g-object)
+  (tree_view (g-object tree-view))
   (drag-x :int)
   (drag-y :int)
   (path :pointer)
diff --git a/gtk/gtk.widget.lisp b/gtk/gtk.widget.lisp
index 622ab8e..2239db3 100644
--- a/gtk/gtk.widget.lisp
+++ b/gtk/gtk.widget.lisp
@@ -3,13 +3,13 @@
 ; 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))
+  (selection gdk-atom-as-string :initform nil)
+  (target gdk-atom-as-string :initform nil)
+  (type gdk-atom-as-string :initform nil)
+  (format :int :initform 0)
+  (data :pointer :initform (null-pointer))
+  (length :int :initform 0)
+  (display (g-object display) :initform nil))
 
 (export (boxed-related-symbols 'selection-data))
 
-- 
1.7.10.4