;; 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: gtk.lisp,v 1.20 2004-12-04 00:34:49 espen Exp $
+;; $Id: gtk.lisp,v 1.26 2004-12-21 00:15:19 espen Exp $
(in-package "GTK")
;;;; Dialog
-(defmethod shared-initialize ((dialog dialog) names &rest initargs &key button)
- (declare (ignore button))
- (call-next-method)
- (dolist (button-definition (get-all initargs :button))
- (apply #'dialog-add-button dialog (mklist button-definition))))
+(defmethod shared-initialize ((dialog dialog) names &rest initargs
+ &key button buttons)
+ (declare (ignore button buttons))
+ (prog1
+ (call-next-method)
+ (initial-apply-add dialog #'dialog-add-button initargs :button :buttons)))
-(defvar %*response-id-key* (gensym))
-
(defun %dialog-find-response-id-num (dialog id &optional create-p error-p)
(or
(cadr (assoc id (rest (type-expand-1 'response-type))))
- (let ((response-ids (object-data dialog %*response-id-key*)))
+ (let ((response-ids (object-data dialog 'response-id-key)))
(cond
((and response-ids (position id response-ids :test #'equal)))
(create-p
(1- (length response-ids)))
(t
(setf
- (object-data dialog %*response-id-key*)
+ (object-data dialog 'response-id-key)
(make-array 1 :adjustable t :fill-pointer t :initial-element id))
0)))
(error-p
(rassoc
(list response-id-num)
(rest (type-expand-1 'response-type)) :test #'equal))
- (aref (object-data dialog %*response-id-key*) response-id-num )))
+ (aref (object-data dialog 'response-id-key) response-id-num )))
(defmethod signal-connect ((dialog dialog) signal function &key object after)
(defun dialog-add-button (dialog label &optional (response label)
&key default object after)
- "Adds a button to the dialog. If no response is given, then label
- will be used."
+ "Adds a button to the dialog."
(let* ((id (if (functionp response)
label
response))
((%dialog-find-response-id-num dialog response-id nil t) int)
(sensitive boolean))
+#+gtk2.6
+(defbinding alternative-dialog-button-order-p(&optional screen)
+ (screen (or null screen)))
+
+#+gtk2.6
+(defbinding (dialog-set-alternative-button-order
+ "gtk_dialog_set_alternative_button_order_from_array")
+ (dialog new-order)
+ (dialog dialog)
+ ((length new-order) int)
+ ((map 'vector #'(lambda (id)
+ (%dialog-find-response-id-num dialog id nil t))
+ new-order) (vector int)))
-;; Addition dialog functions
(defmethod container-add ((dialog dialog) (child widget) &rest args)
(apply #'container-add (dialog-vbox dialog) child args))
-;;; Drawing area -- no functions
+;;; Drawing area
+
+(defbinding drawing-area-get-size () nil
+ (drawing-area drawing-area)
+ (width int :out)
+ (height int :out))
;;; Entry
(y int :out))
+;;; Entry Completion
+
+(def-callback-marshal %entry-completion-match-func
+ (boolean entry-completion string (copy-of tree-iter)))
+
+(defbinding entry-completion-set-match-func (completion function) nil
+ (completion entry-completion)
+ ((callback %entry-completion-match-func) pointer)
+ ((register-callback-function function) unsigned-int)
+ ((callback %destroy-user-data) pointer))
+
+(defbinding entry-completion-complete () nil
+ (completion entry-completion))
+
+#+gtk2.6
+(defbinding entry-completion-insert-prefix () nil
+ (completion entry-completion))
+
+(defbinding entry-completion-insert-action-text () nil
+ (completion entry-completion)
+ (index int)
+ (text string))
+
+(defbinding entry-completion-insert-action-markup () nil
+ (completion entry-completion)
+ (index int)
+ (markup string))
+
+(defbinding entry-completion-delete-action () nil
+ (completion entry-completion)
+ (index int))
+
+
;;; Image
(defbinding image-set-from-file () nil
(allocation int))
+;;; Message dialog
+
+(defmethod initialize-instance ((dialog message-dialog) &rest initargs
+ &key (type :info) (buttons :close) ; or :ok?
+ flags message parent)
+ (remf initargs :parent)
+ (setf
+ (slot-value dialog 'location)
+ (%message-dialog-new parent flags type buttons nil))
+ (message-dialog-set-markup dialog message)
+ (apply #'call-next-method dialog initargs))
+
+
+(defbinding %message-dialog-new () pointer
+ (parent (or null window))
+ (flags dialog-flags)
+ (type message-type)
+ (buttons buttons-type)
+ (message (or null string)))
+
+(defbinding %message-dialog-new-with-markup () pointer
+ (parent (or null window))
+ (flags dialog-flags)
+ (type message-type)
+ (buttons buttons-type)
+ (message string))
+
+(defbinding message-dialog-set-markup () nil
+ (message-dialog message-dialog)
+ (markup string))
+
+#+gtk2.6
+(defbinding message-dialog-format-secondary-text () nil
+ (message-dialog message-dialog)
+ (text string))
+
+#+gtk2.6
+(defbinding message-dialog-format-secondary-markup () nil
+ (message-dialog message-dialog)
+ (markup string))
+
+
;;; Radio menu item
;;; Window
-(defmethod initialize-instance ((window window) &rest initargs &key accel-group)
- (declare (ignore accel-group))
- (call-next-method)
- (mapc #'(lambda (accel-group)
- (window-add-accel-group window accel-group))
- (get-all initargs :accel-group)))
+(defmethod initialize-instance ((window window) &rest initargs
+ &key accel-group accel-groups)
+ (declare (ignore accel-group accel-groups))
+ (prog1
+ (call-next-method)
+ (initial-add window #'window-add-accel-group
+ initargs :accel-group :accel-groups)))
(defbinding window-set-wmclass () nil
(resize boolean)
(shrink boolean))
-(defun (setf paned-child1) (child paned)
- (paned-pack1 paned child nil t)
- child)
-
-(defun (setf paned-child2) (child paned)
- (paned-pack2 paned child t t)
- child)
-
-;; Defined in gtkglue.c
-(defbinding paned-child1 () widget
- (paned paned)
- (resize boolean :out)
- (shrink boolean :out))
-
-;; Defined in gtkglue.c
-(defbinding paned-child2 () widget
- (paned paned)
- (resize boolean :out)
- (shrink boolean :out))
-
-
;;; Layout
(columns unsigned-int))
(defbinding table-attach (table child left right top bottom
- &key (x-options '(:expand :fill))
- (y-options '(:expand :fill))
- (x-padding 0) (y-padding 0)) nil
+ &key options x-options y-options
+ (x-padding 0) (y-padding 0)) nil
(table table)
(child widget)
(left unsigned-int)
(right unsigned-int)
(top unsigned-int)
(bottom unsigned-int)
- (x-options attach-options)
- (y-options attach-options)
+ ((append (mklist options) (mklist x-options)) attach-options)
+ ((append (mklist options) (mklist y-options)) attach-options)
(x-padding unsigned-int)
(y-padding unsigned-int))
(progress-bar progress-bar))
+;;; Size group
+
+(defmethod initialize-instance ((size-group size-group) &rest initargs
+ &key widget widgets)
+ (declare (ignore widget widgets))
+ (prog1
+ (call-next-method)
+ (initial-add size-group #'size-group-add-widget
+ initargs :widget :widgets)))
+
+
+(defbinding size-group-add-widget () nil
+ (size-group size-group)
+ (widget widget))
+
+(defbinding size-group-remove-widget () nil
+ (size-group size-group)
+ (widget widget))
+
;;; Stock items
;;; Accelerator Groups
#|
-(defbinding accel-group-get-default () accel-group)
-
-(deftype-method alien-ref accel-group (type-spec)
- (declare (ignore type-spec))
- '%accel-group-ref)
-
-(deftype-method alien-unref accel-group (type-spec)
- (declare (ignore type-spec))
- '%accel-group-unref)
-
-(defbinding %accel-group-ref () accel-group
- (accel-group (or accel-group pointer)))
-
-(defbinding %accel-group-unref () nil
- (accel-group (or accel-group pointer)))
-
(defbinding accel-group-activate (accel-group key modifiers) boolean
(accel-group accel-group)
((gdk:keyval-from-name key) unsigned-int)
~mdw / clg / blobdiff