From c46ca281afdc57c6dc120811134354f3b0f9ff2f Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Wed, 26 Apr 2006 20:31:12 +0000 Subject: [PATCH] Manual slot definitions for icon-view Organization: Straylight/Edgeware From: espen --- gtk/gtktree.lisp | 38 +++++++++++++++++++++++++++++++++++++- gtk/gtktypes.lisp | 26 ++++++++++++++++++++++---- 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/gtk/gtktree.lisp b/gtk/gtktree.lisp index 503b5c5..e67e26f 100644 --- a/gtk/gtktree.lisp +++ b/gtk/gtktree.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: gtktree.lisp,v 1.19 2006-04-26 12:13:38 espen Exp $ +;; $Id: gtktree.lisp,v 1.20 2006-04-26 20:31:12 espen Exp $ (in-package "GTK") @@ -969,18 +969,54 @@ (defbinding %icon-view-set-text-column (column icon-view) nil column (column-index (icon-view-model icon-view) column)) int)) + (defbinding %%icon-view-get-text-column () int + (icon-view icon-view)) + + (defun %icon-view-get-text-column (icon-view) + (column-index + (icon-view-model icon-view) + (%%icon-view-get-text-column icon-view))) + + (defun %icon-view-text-column-boundp (icon-view) + (not (eql (%%icon-view-get-text-column icon-view) -1))) + + (defbinding %icon-view-set-markup-column (column icon-view) nil (icon-view icon-view) ((if (integerp column) column (column-index (icon-view-model icon-view) column)) int)) + (defbinding %%icon-view-get-markup-column () int + (icon-view icon-view)) + + (defun %icon-view-get-markup-column (icon-view) + (column-index + (icon-view-model icon-view) + (%%icon-view-get-markup-column icon-view))) + + (defun %icon-view-markup-column-boundp (icon-view) + (not (eql (%%icon-view-get-markup-column icon-view) -1))) + + (defbinding %icon-view-set-pixbuf-column (column icon-view) nil (icon-view icon-view) ((if (integerp column) column (column-index (icon-view-model icon-view) column)) int))) + (defbinding %%icon-view-get-pixbuf-column () int + (icon-view icon-view)) + + (defun %icon-view-get-pixbuf-column (icon-view) + (column-index + (icon-view-model icon-view) + (%%icon-view-get-pixbuf-column icon-view))) + + (defun %icon-view-pixbuf-column-boundp (icon-view) + (not (eql (%%icon-view-get-pixbuf-column icon-view) -1))) + + #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0") (progn (defbinding icon-view-get-item-at-pos () boolean diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp index d51c181..cce4e9a 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.46 2006-04-26 12:12:37 espen Exp $ +;; $Id: gtktypes.lisp,v 1.47 2006-04-26 20:31:12 espen Exp $ (in-package "GTK") @@ -1053,9 +1053,27 @@ (default-height :merge t :unbound -1))) #?(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) -- [mdw]