;; 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.16 2004-11-07 01:23:38 espen Exp $
+;; $Id: gtk.lisp,v 1.23 2004-12-20 20:00:07 espen Exp $
(in-package "GTK")
;;; Gtk version
-(defbinding check-version () string
+(defbinding check-version () (copy-of string)
(required-major unsigned-int)
(required-minor unsigned-int)
(required-micro unsigned-int))
(format nil "Gtk+ v~A.~A" major minor)
(format nil "Gtk+ v~A.~A.~A" major minor micro))))
-(defbinding get-default-language () string)
+(defbinding get-default-language () (copy-of pango:language))
;;;; Initalization
(fill boolean)
(padding unsigned-int))
-(defun box-pack (box child &key from-end expand fill (padding 0))
- (if from-end
+(defun box-pack (box child &key end expand fill (padding 0))
+ (if end
(box-pack-end box child expand fill padding)
(box-pack-start box child expand fill padding)))
-;;; Combo
+;;;; Combo Box
-(defmethod shared-initialize ((combo combo) names &rest initargs
- &key popdown-strings)
- (declare (ignore initargs))
- (call-next-method)
- (when popdown-strings
- (combo-set-popdown-strings combo popdown-strings)))
-
-(defbinding combo-set-popdown-strings () nil
- (combo combo)
- (strings (glist string)))
+(defmethod shared-initialize ((combo-box combo-box) names &key model content)
+ (unless model
+ (setf
+ (combo-box-model combo-box)
+ (make-instance 'list-store :column-types '(string)))
+ (unless (typep combo-box 'combo-box-entry)
+ (let ((cell (make-instance 'cell-renderer-text)))
+ (cell-layout-pack combo-box cell :expand t)
+ (cell-layout-add-attribute combo-box cell :text 0)))
+ (when content
+ (map 'nil #'(lambda (text)
+ (combo-box-append-text combo-box text))
+ content)))
+ (call-next-method))
+
+;; (defmethod shared-initialize :after ((combo-box combo-box) names &key active)
+;; (when active
+;; (signal-emit combo-box 'changed)))
+
+(defbinding combo-box-append-text () nil
+ (combo-box combo-box)
+ (text string))
-(defbinding combo-disable-activate () nil
- (combo combo))
+(defbinding combo-box-insert-text () nil
+ (combo-box combo-box)
+ (position int)
+ (text string))
+(defbinding combo-box-prepend-text () nil
+ (combo-box combo-box)
+ (text string))
+#+gtk2.6
+(defbinding combo-box-get-active-text () string
+ (combo-box combo-box))
-;;;; Dialog
+(defbinding combo-box-popup () nil
+ (combo-box combo-box))
-(defmethod shared-initialize ((dialog dialog) names &rest initargs &key button)
- (declare (ignore button))
+(defbinding combo-box-popdown () nil
+ (combo-box combo-box))
+
+
+
+;;;; Combo Box Entry
+
+(defmethod shared-initialize ((combo-box-entry combo-box-entry) names &key model)
(call-next-method)
- (dolist (button-definition (get-all initargs :button))
- (apply #'dialog-add-button dialog (mklist button-definition))))
+ (unless model
+ (setf (combo-box-entry-text-column combo-box-entry) 0)))
+
+
+;;;; Dialog
+
+(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))
-;;; Drawing area -- no functions
+;;; Drawing area
+
+(defbinding drawing-area-get-size () nil
+ (drawing-area drawing-area)
+ (width int :out)
+ (height int :out))
;;; Entry
(radio-button-add-to-group button group-with)))
-;;; Option menu
-
-(defbinding %option-menu-set-menu () nil
- (option-menu option-menu)
- (menu widget))
-
-(defbinding %option-menu-remove-menu () nil
- (option-menu option-menu))
-
-(defun (setf option-menu-menu) (menu option-menu)
- (if (not menu)
- (%option-menu-remove-menu option-menu)
- (%option-menu-set-menu option-menu menu))
- menu)
-
-
-
;;; Item
(defbinding item-select () nil
;;; Window
+(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
(window window)
(wmclass-name string)
;(defbinding window-set-geometry-hints)
-(defbinding window-list-toplevels () (glist window))
+(defbinding window-list-toplevels () (glist (copy-of window))
+ "Returns a list of all existing toplevel windows.")
(defbinding window-add-mnemonic (window key target) nil
(window window)
((%notebook-child notebook page) widget))
(defbinding (notebook-tab-label-text "gtk_notebook_get_tab_label_text")
- (notebook page) string
+ (notebook page) (copy-of string)
(notebook notebook)
((%notebook-child notebook page) widget))
((%notebook-child notebook page) widget))
(defbinding (notebook-menu-label-text "gtk_notebook_get_menu_label_text")
- (notebook page) string
+ (notebook page) (copy-of string)
(notebook notebook)
((%notebook-child notebook page) widget))
(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
(defun menu-popup (menu button activate-time &key callback parent-menu-shell
parent-menu-item)
(if callback
- (let ((callback-id (register-callback-function callback)))
- (unwind-protect
- (%menu-popup
- menu parent-menu-shell parent-menu-item
- (callback %menu-popup-callback)
- callback-id button activate-time)
- (destroy-user-data callback-id)))
+ (with-callback-function (id callback)
+ (%menu-popup
+ menu parent-menu-shell parent-menu-item
+ (callback %menu-popup-callback) id button activate-time))
(%menu-popup
menu parent-menu-shell parent-menu-item nil 0 button activate-time)))
(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
-(defbinding stock-lookup () boolean
+(defbinding %stock-item-copy () pointer
+ (location pointer))
+
+(defbinding %stock-item-free () nil
+ (location pointer))
+
+(defmethod reference-foreign ((class (eql (find-class 'stock-item))) location)
+ (%stock-item-copy location))
+
+(defmethod unreference-foreign ((class (eql (find-class 'stock-item))) location)
+ (%stock-item-free location))
+
+(defbinding stock-add (stock-item) nil
+ (stock-item stock-item)
+ (1 unsigned-int))
+
+(defbinding stock-list-ids () (gslist string))
+
+(defbinding %stock-lookup () boolean
(stock-id string)
- (stock-item stock-item :out))
-
+ (location pointer))
+(defun stock-lookup (stock-id)
+ (let ((location
+ (allocate-memory (proxy-instance-size (find-class 'stock-item)))))
+ (unwind-protect
+ (when (%stock-lookup stock-id location)
+ (ensure-proxy-instance 'stock-item (%stock-item-copy location)))
+ (deallocate-memory location))))
;;; Tooltips
;;; 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