diff options
| author | jenglish <jenglish@flightlab.com> | 2006-12-09 20:53:34 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@flightlab.com> | 2006-12-09 20:53:34 (GMT) |
| commit | aa6a6357d7817246ce156df37f80d09099c4a432 (patch) | |
| tree | 7942f315ad17189194fd68ddf9fbae2a126b28ab /generic/ttk/ttkTreeview.c | |
| parent | 4d019dc6fa1bb6b988c93a610ad077d776b5574e (diff) | |
| download | tk-aa6a6357d7817246ce156df37f80d09099c4a432.zip tk-aa6a6357d7817246ce156df37f80d09099c4a432.tar.gz tk-aa6a6357d7817246ce156df37f80d09099c4a432.tar.bz2 | |
Merged duplicate functionality between image element factory,
image element, and -image option processing. Image element
factory now takes an imageSpec argument instead of a separate
image name and -map option.
Diffstat (limited to 'generic/ttk/ttkTreeview.c')
| -rw-r--r-- | generic/ttk/ttkTreeview.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c index 70b328e..6990c8f 100644 --- a/generic/ttk/ttkTreeview.c +++ b/generic/ttk/ttkTreeview.c @@ -1,5 +1,5 @@ /* - * $Id: ttkTreeview.c,v 1.5 2006/11/27 06:53:55 jenglish Exp $ + * $Id: ttkTreeview.c,v 1.6 2006/12/09 20:53:35 jenglish Exp $ * Copyright (c) 2004, Joe English * * ttk::treeview widget implementation. @@ -949,14 +949,14 @@ static int ConfigureItem( } /* Validate -image option. - * @@@ TODO: keep images array around */ if (item->imageObj) { - Tk_Image *images = NULL; - if (TtkGetImageList(interp, &tv->core, item->imageObj, &images) != TCL_OK) + Ttk_ImageSpec *imageSpec = + TtkGetImageSpec(interp, tv->core.tkwin, item->imageObj); + if (!imageSpec) { goto error; - if (images) - TtkFreeImageList(images); + } + TtkFreeImageSpec(imageSpec); /* @@@TODO: Keep this around */ } /* Keep TTK_STATE_OPEN flag in sync with item->openObj. |