X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/75689fea8b73ccc1e8cb32b671b7fd881da40cf3..39551e64989423bc2cbc50119e8bfb64dedfebba:/gtk/gtktypes.lisp diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp index 118b95a..db1c2e1 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.44 2006-02-26 15:30:01 espen Exp $ +;; $Id: gtktypes.lisp,v 1.51 2006-09-27 08:45:29 espen Exp $ (in-package "GTK") @@ -110,19 +110,16 @@ :accessor stock-item-translation-domain :initarg :translation-domain :type string)) - (:metaclass struct-class)) + (:metaclass struct-class) + (:ref stock-item-copy) + (:unref stock-item-free)) -;; We don't really need to access any slots in this class, so we just -;; specify the total size (defclass tree-iter (boxed) - ( -;; (stamp :allocation :alien :type int) -;; (user-data :allocation :alien :type pointer) -;; (user-data2 :allocation :alien :type pointer) -;; (user-data3 :allocation :alien :type pointer) - ) - (:metaclass boxed-class) - (:size #.(+ (size-of 'int) (* 3 (size-of 'pointer))))) + ((stamp :allocation :alien :type int) + (user-data :allocation :alien :type pointer) + (user-data2 :allocation :alien :type pointer) + (user-data3 :allocation :alien :type pointer)) + (:metaclass boxed-class)) ;; (defclass tree-path (boxed) @@ -136,20 +133,18 @@ (deftype position () '(or int (enum (:start 0) (:end -1) (:first 0) (:last -1)))) -(define-type-method from-alien-form ((type position) form) - (declare (ignore type)) +(define-type-method from-alien-form ((type position) form &key ref) + (declare (ignore type ref)) (from-alien-form 'int form)) -(define-type-method from-alien-function ((type position)) - (declare (ignore type)) +(define-type-method from-alien-function ((type position) &key ref) + (declare (ignore type ref)) (from-alien-function 'int)) -(define-type-method reader-function ((type position)) - (declare (ignore type)) +(define-type-method reader-function ((type position) &optional ref) + (declare (ignore type ref)) (reader-function 'int)) - - (define-types-by-introspection "Gtk" ;; Manually defined ("GtkObject" :ignore t) @@ -235,14 +230,13 @@ ((child :ignore t) (children :allocation :virtual - :getter container-children :setter (setf container-children) - ;; The following doesn't work because gtk_container_get_children doesn't - ;; increase the reference count of the children -; :getter "gtk_container_get_children" -; :reader container-children -; :type (glist widget) - ) + :getter "gtk_container_get_children" + :reader container-children + :type (glist (copy-of widget))) + (internal-children ; for debugging + :allocation :virtual + :getter container-internal-children) (child-type :allocation :virtual :getter "gtk_container_child_type" @@ -345,6 +339,7 @@ (default-height :merge t :unbound -1))) ("GtkWindowGroup" + :dependencies (window) :slots ((grabs :allocation :alien @@ -418,26 +413,26 @@ ("GtkScrolledWindow" :slots - (#-gtk2.8 + (#?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0") (hscrollbar :allocation :alien :reader scrolled-window-hscrollbar :type widget) - #-gtk2.8 + #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0") (vscrollbar :allocation :alien :reader scrolled-window-vscrollbar :type widget) - #+gtk2.8 + #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0") (hscrollbar :allocation :virtual :getter "gtk_scrolled_window_get_hscrollbar" :reader scrolled-window-hscrollbar :type widget) - #+gtk2.8 + #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0") (vscrollbar :allocation :virtual - :getter "gtk_scrolled_window_get_hscrollbar" + :getter "gtk_scrolled_window_get_vscrollbar" :reader scrolled-window-vscrollbar :type widget))) @@ -486,7 +481,7 @@ :getter "gtk_menu_get_attach_widget" :reader menu-attach-widget :type widget) - #-gtk2.6 + #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") (tearoff-state :allocation :virtual :getter "gtk_menu_get_tearoff_state" @@ -495,6 +490,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 @@ -616,20 +627,20 @@ ; deprecated property ((shadow :ignore t))) - ("GtkTable" - :slots - ((column-spacing - :allocation :virtual - :getter "gtk_table_get_default_col_spacing" - :setter "gtk_table_set_col_spacings" - :initarg :column-spacing - :type unsigned-int) - (row-spacing - :allocation :virtual - :getter "gtk_table_get_default_row_spacing" - :setter "gtk_table_set_row_spacings" - :initarg :row-spacing - :type unsigned-int))) +;; ("GtkTable" +;; :slots +;; ((column-spacing +;; :allocation :virtual +;; :getter "gtk_table_get_default_col_spacing" +;; :setter "gtk_table_set_col_spacings" +;; :initarg :column-spacing +;; :type unsigned-int) +;; (row-spacing +;; :allocation :virtual +;; :getter "gtk_table_get_default_row_spacing" +;; :setter "gtk_table_set_row_spacings" +;; :initarg :row-spacing +;; :type unsigned-int))) ("GtkDialog" :slots @@ -659,7 +670,7 @@ :accessor entry-completion :type entry-completion) (max-length :merge t :unbound 0) - #+gtk2.6 + #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") (width-chars :merge t :unbound -1))) ("GtkEntryCompletion" @@ -670,7 +681,7 @@ :reader entry-completion-entry :type entry) (minimum-key-length :merge t :unbound -1) - #+gtk2.6 + #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") (text-column :merge t :unbound -1))) ("GtkRadioButton" @@ -750,7 +761,7 @@ ("GtkImage" :slots ((file :ignore t) - #+gtk2.6 + #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") (pixel-size :merge t :unbound -1))) ("GtkLabel" @@ -940,7 +951,7 @@ :allocation :virtual :getter "gtk_text_mark_get_name" :reader text-mark-name - :type string) + :type (copy-of string)) (visible :allocation :virtual :getter "gtk_text_mark_get_visible" @@ -987,7 +998,7 @@ :allocation :virtual :getter "gtk_toggle_action_get_active" :setter "gtk_toggle_action_set_active" - :initarg :active +; :initarg :active :accessor toggle-action-active-p :type boolean))) @@ -1034,12 +1045,30 @@ :reader clipboard-display :type gdk:display))) - #+gtk2.6 + #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0") ("GtkIconView" :slots - ((text-column :merge t :setter %icon-view-set-text-column) - (markup-column :merge t :setter %icon-view-set-markup-column) - (pixbuf-column :merge t :setter %icon-view-set-pixbuf-column))) + ((text-column + :allocation :virtual + :getter %icon-view-get-text-column + :setter %icon-view-set-text-column + :boundp %icon-view-text-column-boundp + :initarg :text-column + :accessor icon-view-text-column) + (markup-column + :allocation :virtual + :getter %icon-view-get-markup-column + :setter %icon-view-set-tmarkup-column + :boundp %icon-view-markup-column-boundp + :initarg :markup-column + :accessor icon-view-markup-column) + (pixbuf-column + :allocation :virtual + :getter %icon-view-get-pixbuf-column + :setter %icon-view-set-pixbuf-column + :boundp %icon-view-pixbuf-column-boundp + :initarg :pixbuf-column + :accessor icon-view-pixbuf-column))) ;; Not needed ("GtkFundamentalType" :ignore t) @@ -1186,7 +1215,7 @@ :type quark)) (:metaclass struct-class)) -#+gtk2.8 +#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0") (define-enum-type drop-position :no-drop :drop-into :drop-left :drop-right :drop-above :drop-below) @@ -1237,4 +1266,6 @@ (defclass target-list (proxy) () - (:metaclass proxy-class)) + (:metaclass proxy-class) + (:ref target-list-ref) + (:unref target-list-unref))