[gtk-cffi-cvs] CVS gtk-cffi/gtk
CVS User rklochkov
rklochkov at common-lisp.net
Sun Feb 12 17:29:42 UTC 2012
Update of /project/gtk-cffi/cvsroot/gtk-cffi/gtk
In directory tiger.common-lisp.net:/tmp/cvs-serv24265/gtk
Modified Files:
button.lisp dialog.lisp entry.lisp expander.lisp
file-chooser-button.lisp file-chooser-dialog.lisp
file-chooser.lisp frame.lisp icon.lisp image.lisp label.lisp
menu-item.lisp message-dialog.lisp package.lisp statusbar.lisp
text-buffer.lisp text-mark.lisp tree-model.lisp
tree-view-column.lisp widget.lisp window.lisp
Log Message:
Changed from cffi to cffi-objects
Dropped GTK-STRING
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/button.lisp 2011/04/25 19:16:08 1.1.1.1
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/button.lisp 2012/02/12 17:29:42 1.2
@@ -5,11 +5,11 @@
(defcfun "gtk_button_new" :pointer)
-(defcfun "gtk_button_new_with_label" :pointer (label gtk-string))
+(defcfun "gtk_button_new_with_label" :pointer (label :string))
-(defcfun "gtk_button_new_with_mnemonic" :pointer (label gtk-string))
+(defcfun "gtk_button_new_with_mnemonic" :pointer (label :string))
-(defcfun "gtk_button_new_from_stock" :pointer (label gtk-string))
+(defcfun "gtk_button_new_from_stock" :pointer (label :string))
(defmethod gconstructor ((button button)
&key label type &allow-other-keys)
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/dialog.lisp 2011/08/26 17:16:14 1.2
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/dialog.lisp 2012/02/12 17:29:42 1.3
@@ -13,7 +13,7 @@
:apply :no :yes :close :cancel :ok :delete :accept :reject :none)
(defcfun "gtk_dialog_new_with_buttons"
- :pointer (title gtk-string)
+ :pointer (title :string)
(parent pobject) (flags dialog-flags) (null :pointer))
(defcfun "gtk_dialog_new" :pointer)
@@ -43,7 +43,7 @@
resp))
(defcfun "gtk_dialog_add_button" pobject (dialog pobject)
- (str gtk-string) (resp dialog-response))
+ (str :string) (resp dialog-response))
(defmethod add-button ((dialog dialog) str response)
(gtk-dialog-add-button dialog (if (keywordp str) (string-downcase str) str)
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/entry.lisp 2011/08/26 17:16:14 1.2
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/entry.lisp 2012/02/12 17:29:42 1.3
@@ -18,8 +18,8 @@
&key &allow-other-keys)
(gtk-entry-new))
-(defcfun gtk-entry-get-text gtk-string (entry pobject))
-(defcfun gtk-entry-set-text :void (entry pobject) (text gtk-string))
+(defcfun gtk-entry-get-text :string (entry pobject))
+(defcfun gtk-entry-set-text :void (entry pobject) (text :string))
(defmethod text ((entry entry) &rest rest)
(declare (ignore rest))
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/expander.lisp 2011/08/26 17:16:14 1.1
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/expander.lisp 2012/02/12 17:29:42 1.2
@@ -3,8 +3,8 @@
(defclass expander (bin)
())
-(defcfun gtk-expander-new-with-mnemonic :pointer (label gtk-string))
-(defcfun gtk-expander-new :pointer (label gtk-string))
+(defcfun gtk-expander-new-with-mnemonic :pointer (label :string))
+(defcfun gtk-expander-new :pointer (label :string))
(defmethod gconstructor ((expander expander)
&key label mnemonic &allow-other-keys)
@@ -13,7 +13,7 @@
(gtk-expander-new label)))
(defgtkslots expander
- label gtk-string
+ label :string
spacing :int
expanded :boolean
use-underline :boolean
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/file-chooser-button.lisp 2011/08/26 17:16:14 1.2
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/file-chooser-button.lisp 2012/02/12 17:29:42 1.3
@@ -4,10 +4,10 @@
())
(defcfun "gtk_file_chooser_button_new" :pointer
- (title gtk-string) (action file-chooser-action))
+ (title :string) (action file-chooser-action))
;(defcfun "gtk_file_chooser_button_new_with_backend" :pointer
-; (title gtk-string) (action file-chooser-action) (backend gtk-string))
+; (title :string) (action file-chooser-action) (backend :string))
(defmethod gconstructor ((file-chooser-button file-chooser-button)
&key title action &allow-other-keys)
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/file-chooser-dialog.lisp 2011/08/26 17:16:14 1.2
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/file-chooser-dialog.lisp 2012/02/12 17:29:42 1.3
@@ -4,16 +4,16 @@
())
(defcfun "gtk_file_chooser_dialog_new" :pointer
- (title gtk-string) (parent pobject) (action file-chooser-action)
- (but1-text gtk-string) (but1-response dialog-response)
- (but2-text gtk-string) (but2-response dialog-response)
+ (title :string) (parent pobject) (action file-chooser-action)
+ (but1-text :string) (but1-response dialog-response)
+ (but2-text :string) (but2-response dialog-response)
(null :pointer))
;; (defcfun "gtk_file_chooser_dialog_new_with_backend" :pointer
-;; (title gtk-string) (parent pobject) (action file-chooser-action)
-;; (backend gtk-string)
-;; (but1-text gtk-string) (but1-response dialog-response)
-;; (but2-text gtk-string) (but2-response dialog-response)
+;; (title :string) (parent pobject) (action file-chooser-action)
+;; (backend :string)
+;; (but1-text :string) (but1-response dialog-response)
+;; (but2-text :string) (but2-response dialog-response)
;; (null :pointer))
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/file-chooser.lisp 2011/04/25 19:16:08 1.1.1.1
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/file-chooser.lisp 2012/02/12 17:29:42 1.2
@@ -7,12 +7,12 @@
:open :save :select-folder :create-folder)
(defcfun "gtk_file_chooser_set_filename" :boolean
- (chooser pobject) (filename gtk-string))
+ (chooser pobject) (filename :string))
(defmethod (setf filename) (filename (file-chooser file-chooser))
(gtk-file-chooser-set-filename file-chooser filename))
-(defcfun "gtk_file_chooser_get_filename" gtk-string (chooser pobject))
+(defcfun "gtk_file_chooser_get_filename" :string (chooser pobject))
(defmethod filename ((file-chooser file-chooser))
(gtk-file-chooser-get-filename file-chooser))
\ No newline at end of file
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/frame.lisp 2011/09/15 10:28:21 1.2
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/frame.lisp 2012/02/12 17:29:42 1.3
@@ -3,7 +3,7 @@
(defclass frame (bin)
())
-(defcfun "gtk_frame_new" :pointer (label gtk-string))
+(defcfun "gtk_frame_new" :pointer (label :string))
(defmethod gconstructor ((frame frame)
&key label &allow-other-keys)
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/icon.lisp 2011/08/26 17:16:14 1.2
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/icon.lisp 2012/02/12 17:29:42 1.3
@@ -23,9 +23,9 @@
(defgtkslots icon-source
direction text-direction
direction-wildcarded :boolean
- filename gtk-string
+ filename :string
pixbuf pobject
- icon-name gtk-string
+ icon-name :string
size icon-size
size-wildcarded :boolean
state state
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/image.lisp 2011/04/25 19:16:08 1.1.1.1
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/image.lisp 2012/02/12 17:29:42 1.2
@@ -3,12 +3,12 @@
(defclass image (misc)
())
-(defcfun "gtk_image_new_from_file" :pointer (filename gtk-string))
+(defcfun "gtk_image_new_from_file" :pointer (filename :string))
;(defcenum "gtk_image_new_from_icon_set" :pointer
; (icon-set pobject) (icon-size icon-size))
(defcfun "gtk_image_new_from_pixbuf" :pointer (pixbuf pobject))
(defcfun "gtk_image_new_from_stock" :pointer
- (stock-id gtk-string) (size icon-size))
+ (stock-id :string) (size icon-size))
(defmethod gconstructor ((image image) &key file pixbuf stock-id icon-size)
(cond
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/label.lisp 2012/01/27 18:41:31 1.2
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/label.lisp 2012/02/12 17:29:42 1.3
@@ -6,22 +6,22 @@
(defcenum justification
:left :right :center :fill)
-(defcfun "gtk_label_new" :pointer (text gtk-string))
+(defcfun "gtk_label_new" :pointer (text :string))
(defmethod gconstructor ((label label)
&key text &allow-other-keys)
(gtk-label-new text))
-(defcfun "gtk_label_set_markup" :void (label pobject) (text gtk-string))
+(defcfun "gtk_label_set_markup" :void (label pobject) (text :string))
(defcfun "gtk_label_set_markup_with_mnemonic"
- :void (label pobject) (text gtk-string))
+ :void (label pobject) (text :string))
(defcfun "gtk_label_set_text_with_mnemonic"
- :void (label pobject) (text gtk-string))
+ :void (label pobject) (text :string))
(defcfun "gtk_label_set_text"
- :void (label pobject) (text gtk-string))
+ :void (label pobject) (text :string))
(defmethod (setf text) (text (label label) &key mnemonic markup)
(apply
@@ -33,9 +33,9 @@
#'gtk-label-set-text))
(list label text)))
-(defcfun "gtk_label_get_text" gtk-string (label pobject))
+(defcfun "gtk_label_get_text" :string (label pobject))
-(defcfun "gtk_label_get_label" gtk-string (label pobject))
+(defcfun "gtk_label_get_label" :string (label pobject))
(defmethod text ((label label) &key markup)
(apply
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/menu-item.lisp 2011/08/28 10:30:13 1.1
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/menu-item.lisp 2012/02/12 17:29:42 1.2
@@ -11,8 +11,8 @@
())
(defcfun gtk-menu-item-new :pointer)
-(defcfun gtk-menu-item-new-with-label :pointer (label gtk-string))
-(defcfun gtk-menu-item-new-with-mnemonic :pointer (label gtk-string))
+(defcfun gtk-menu-item-new-with-label :pointer (label :string))
+(defcfun gtk-menu-item-new-with-mnemonic :pointer (label :string))
(defmethod gconstructor ((menu-item menu-item)
&key label mnemonic &allow-other-keys)
@@ -24,10 +24,10 @@
(defgtkslots menu-item
right-justified :boolean
- label gtk-string
+ label :string
use-underline :boolean
submenu pobject
- accel-path gtk-string
+ accel-path :string
reserve-indicator :boolean)
(defgtkfun select :void menu-item)
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/message-dialog.lisp 2011/04/25 19:16:08 1.1.1.1
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/message-dialog.lisp 2012/02/12 17:29:42 1.2
@@ -11,11 +11,11 @@
(defcfun "gtk_message_dialog_new" :pointer (parent pobject)
(flags dialog-flags) (type message-type) (buttons buttons-type)
- (message gtk-string) (null :pointer))
+ (message :string) (null :pointer))
(defcfun "gtk_message_dialog_new_with_markup" :pointer (parent pobject)
(flags dialog-flags) (type message-type) (buttons buttons-type)
- (message gtk-string) (null :pointer))
+ (message :string) (null :pointer))
(defmethod gconstructor ((message-dialog message-dialog)
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/package.lisp 2012/01/25 19:15:08 1.12
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/package.lisp 2012/02/12 17:29:42 1.13
@@ -8,8 +8,8 @@
(in-package #:cl-user)
(defpackage gtk-cffi
- (:use #:common-lisp #:cffi #:alexandria #:iterate
- #:cffi-object #:g-object-cffi #:g-lib-cffi #:gdk-cffi
+ (:use #:common-lisp #:alexandria #:iterate
+ #:cffi-objects #:g-object-cffi #:g-lib-cffi #:gdk-cffi
#:gtk-cffi-utils)
(:shadow #:image #:window)
(:export
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/statusbar.lisp 2011/09/15 10:28:21 1.3
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/statusbar.lisp 2012/02/12 17:29:42 1.4
@@ -9,9 +9,9 @@
(gtk-statusbar-new))
(defgtkfuns statusbar
- ((statusbar-push . push) :uint (context-id :uint) (text gtk-string))
+ ((statusbar-push . push) :uint (context-id :uint) (text :string))
((statusbar-pop . pop) :void (context-id :uint))
- (:get context-id :uint (context gtk-string))
+ (:get context-id :uint (context :string))
(:get message-area pobject))
(defcfun gtk-statusbar-remove :void
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/text-buffer.lisp 2012/01/25 19:15:08 1.5
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/text-buffer.lisp 2012/02/12 17:29:42 1.6
@@ -12,7 +12,7 @@
(defgtkfuns text-tag-table
(add :void (tag pobject))
((text-tag-table-remove . remove) :void (tag pobject))
- (lookup pobject (name gtk-string))
+ (lookup pobject (name :string))
(:get size :int))
(make-foreach text-tag-table (tag (object text-tag)) (data pdata))
@@ -54,10 +54,10 @@
(defgtkfuns text-iter
((text-iter-char . get-char) unichar)
- (:get slice gtk-string (end pobject))
- ((text-iter-text . get-text) gtk-string (end pobject))
- (:get visible-slice gtk-string (end pobject))
- (:get visible-text gtk-string (end pobject))
+ (:get slice :string (end pobject))
+ ((text-iter-text . get-text) :string (end pobject))
+ (:get visible-slice :string (end pobject))
+ (:get visible-text :string (end pobject))
(:get pixbuf pobject)
(:get marks (g-slist :elt pobject))
(:get toggled-tags (g-slist :elt pobject) (toggle-on :boolean))
@@ -120,11 +120,11 @@
(forward-to-tag-toggle :boolean (tag pobject))
(backward-to-tag-toggle :boolean (tag pobject))
(forward-search :boolean
- (str gtk-string) (flags text-search-flags)
+ (str :string) (flags text-search-flags)
(match-start (struct text-iter :out t))
(match-end (struct text-iter :out t)) (limit pobject))
(backward-search :boolean
- (str gtk-string) (flags text-search-flags)
+ (str :string) (flags text-search-flags)
(match-start (struct text-iter :out t))
(match-end (struct text-iter :out t)) (limit pobject))
((text-iter-equal . equal) :boolean (rhs (struct text-iter)))
@@ -185,10 +185,10 @@
(insert-pixbuf :void (text-iter pobject) (pixbuf pobject))
(insert-child-anchor :void (text-iter pobject) (child-anchor pobject))
(create-child-anchor pobject (text-iter pobject))
- (create-mark pobject (mark-name gtk-string) (where (struct text-iter))
+ (create-mark pobject (mark-name :string) (where (struct text-iter))
(left-gravity :boolean))
(add-mark :void (mark pobject) (where (struct text-iter)))
- (:get mark pobject (name gtk-string))
+ (:get mark pobject (name :string))
(get-insert pobject)
(:get selection-bound pobject)
(:get has-selection :boolean)
@@ -209,8 +209,8 @@
:boolean (format gatom))
(:get copy-target-list (object target-list))
(:get paste-target-list (object target-list))
- (register-deserialize-tagset gatom (tagset-name gtk-string))
- (register-serialize-tagset gatom (tagset-name gtk-string))
+ (register-deserialize-tagset gatom (tagset-name :string))
+ (register-serialize-tagset gatom (tagset-name :string))
(unregister-deserialize-format :void (format gatom))
(unregister-serialize-format :void (format gatom)))
@@ -239,7 +239,7 @@
(gtk-text-buffer-get-end-iter text-buffer text-iter)
text-iter))
-(defcfun gtk-text-buffer-get-text gtk-string (buffer pobject)
+(defcfun gtk-text-buffer-get-text :string (buffer pobject)
(start pobject) (end pobject) (include-hidden :boolean))
(defmethod text ((text-buffer text-buffer) &key
@@ -248,7 +248,7 @@
(gtk-text-buffer-get-text text-buffer start end include-hidden))
(defcfun gtk-text-buffer-set-text :void (buffer pobject)
- (str gtk-string) (length :int))
+ (str :string) (length :int))
(defmethod (setf text) (text (text-buffer text-buffer) &key (length -1))
(gtk-text-buffer-set-text text-buffer text length))
@@ -256,14 +256,14 @@
(save-setter text-buffer text)
(defcfun gtk-text-buffer-insert :void (buffer pobject) (iter pobject)
- (text gtk-string) (len :int))
+ (text :string) (len :int))
(defcfun gtk-text-buffer-insert-at-cursor :void (buffer pobject)
- (text gtk-string) (len :int))
+ (text :string) (len :int))
(defcfun gtk-text-buffer-insert-interactive :boolean (buffer pobject)
- (iter pobject) (text gtk-string) (len :int)
+ (iter pobject) (text :string) (len :int)
(default-editable :boolean))
(defcfun gtk-text-buffer-insert-interactive-at-cursor :boolean (buffer pobject)
- (text gtk-string) (len :int) (default-editable :boolean))
+ (text :string) (len :int) (default-editable :boolean))
(defgeneric insert (text-buffer place text
&key length interactive default-editable))
@@ -326,7 +326,7 @@
(gtk-text-buffer-backspace text-buffer text-iter
interactive default-editable)))
-(defcfun gtk-text-buffer-get-slice gtk-string (buffer pobject)
+(defcfun gtk-text-buffer-get-slice :string (buffer pobject)
(start pobject) (end pobject) (include-hidden :boolean))
(defgeneric text-buffer-slice (text-buffer &key start end)
@@ -343,7 +343,7 @@
(defcfun ,by-obj :void
(buffer pobject) (,tag-name pobject) , at params)
(defcfun ,by-name :void
- (buffer pobject) (,tag-name gtk-string) , at params)
+ (buffer pobject) (,tag-name :string) , at params)
(defgeneric ,name (text-buffer ,tag-name , at cars-params)
(:method ((text-buffer text-buffer) (,tag-name string)
, at cars-params)
@@ -361,7 +361,7 @@
(start (struct text-iter)) (end (struct text-iter))))
(defcfun gtk-text-buffer-create-tag :pointer (buffer pobject)
- (name gtk-string) (null :pointer))
+ (name :string) (null :pointer))
(defgeneric create-tag (text-buffer name &rest properties)
(:method ((text-buffer text-buffer) name &rest properties)
@@ -470,11 +470,11 @@
(gtk-text-buffer-get-serialize-formats text-buffer *array-length*)))
(defcfun gtk-text-buffer-register-deserialize-format gatom
- (buffer pobject) (mime-type gtk-string) (func pfunction)
+ (buffer pobject) (mime-type :string) (func pfunction)
(user-data pdata) (user-data-destroy pfunction))
(defcfun gtk-text-buffer-register-serialize-format gatom
- (buffer pobject) (mime-type gtk-string) (func pfunction)
+ (buffer pobject) (mime-type :string) (func pfunction)
(user-data pdata) (user-data-destroy pfunction))
(defcallback cb-serialize (garray :uint8)
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/text-mark.lisp 2011/09/17 20:04:56 1.1
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/text-mark.lisp 2012/02/12 17:29:42 1.2
@@ -3,7 +3,7 @@
(defclass text-mark (g-object)
())
-(defcfun gtk-text-mark-new :pointer (name gtk-string) (left-gravity :boolean))
+(defcfun gtk-text-mark-new :pointer (name :string) (left-gravity :boolean))
(defmethod gconstructor ((text-mark text-mark) &key name left-gravity
&allow-other-keys)
@@ -13,7 +13,7 @@
(defgtkfuns text-mark
(:get deleted :boolean)
- (:get name gtk-string)
+ (:get name :string)
(:get buffer pobject)
(:get left-gravity :boolean))
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/tree-model.lisp 2011/12/31 17:20:56 1.6
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/tree-model.lisp 2012/02/12 17:29:42 1.7
@@ -7,7 +7,7 @@
(defcfun "gtk_tree_path_free" :void (path pobject))
-(defcfun "gtk_tree_path_new_from_string" :pointer (str gtk-string))
+(defcfun "gtk_tree_path_new_from_string" :pointer (str :string))
(defcfun "gtk_tree_path_new_from_indices" :pointer &rest)
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/tree-view-column.lisp 2011/04/25 19:16:08 1.1.1.1
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/tree-view-column.lisp 2012/02/12 17:29:42 1.2
@@ -27,9 +27,9 @@
(process initargs))))
(defcfun "gtk_tree_view_column_set_title" :void
- (column pobject) (title gtk-string))
+ (column pobject) (title :string))
-(defcfun "gtk_tree_view_column_get_title" gtk-string (column pobject))
+(defcfun "gtk_tree_view_column_get_title" :string (column pobject))
(defmethod (setf title) (value (tree-view-column tree-view-column))
(gtk-tree-view-column-set-title tree-view-column value))
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/widget.lisp 2012/01/27 18:41:31 1.8
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/widget.lisp 2012/02/12 17:29:42 1.9
@@ -123,14 +123,14 @@
:recieves-default :double-buffered :no-show-all)
(defgtkslots widget
- name gtk-string
+ name :string
direction text-direction
default-direction text-direction
parent-window pobject
parent pobject
child-visible :boolean
- tooltip-markup gtk-string
- tooltip-text gtk-string
+ tooltip-markup :string
+ tooltip-text :string
tooltip-window pobject
has-tooltip :boolean
can-default :boolean
@@ -145,7 +145,7 @@
sensitive :boolean
events event-mask
visual pobject
- composite-name gtk-string
+ composite-name :string
halign align
valign align
margin-left :int
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/window.lisp 2011/08/26 17:16:14 1.2
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/window.lisp 2012/02/12 17:29:42 1.3
@@ -11,7 +11,7 @@
(gtk-window-new type))
(defgtkslots window
- title gtk-string
+ title :string
screen pobject
transient-for pobject)
More information about the gtk-cffi-cvs
mailing list