diff options
author | jenglish <jenglish@flightlab.com> | 2006-11-27 06:53:55 (GMT) |
---|---|---|
committer | jenglish <jenglish@flightlab.com> | 2006-11-27 06:53:55 (GMT) |
commit | f712f4ec5ef0bcc07b9d89ea382dd50c02119ee6 (patch) | |
tree | 3306d90d76a3f92d63551f764257f107f5498d36 /generic/ttk/ttkImage.c | |
parent | f9e2925711ddf6f1acc994cb233cf91c8bdb11b2 (diff) | |
download | tk-f712f4ec5ef0bcc07b9d89ea382dd50c02119ee6.zip tk-f712f4ec5ef0bcc07b9d89ea382dd50c02119ee6.tar.gz tk-f712f4ec5ef0bcc07b9d89ea382dd50c02119ee6.tar.bz2 |
* generic/ttk/ttkWidget.c, generic/ttk/ttkPaned.c Fix for #1603506
* library/ttk/button.tcl, library/ttk/combobox.tcl,
library/ttk/utils.tcl: Rename ttk::CopyBindings to ttk::copyBindings
* generic/ttk/ttkTreeview.c, doc/ttk_treeview.n:
-displaycolumns {} now means "no columns" instead of "all columns".
Use -displaycolumns #all for "all columns" [Fixes #1547622].
Diffstat (limited to 'generic/ttk/ttkImage.c')
-rw-r--r-- | generic/ttk/ttkImage.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/generic/ttk/ttkImage.c b/generic/ttk/ttkImage.c index 130fcee..4d80f48 100644 --- a/generic/ttk/ttkImage.c +++ b/generic/ttk/ttkImage.c @@ -1,4 +1,4 @@ -/* $Id: ttkImage.c,v 1.2 2006/11/03 03:06:22 das Exp $ +/* $Id: ttkImage.c,v 1.3 2006/11/27 06:53:55 jenglish Exp $ * Ttk widget set -- image element factory. * * Copyright (C) 2004 Pat Thoyts <patthoyts@users.sf.net> @@ -109,18 +109,10 @@ static void FreeImageData(void *clientData) { ImageData *imageData = clientData; Tcl_DecrRefCount(imageData->baseImage); - if (imageData->imageMap) { - Tcl_DecrRefCount(imageData->imageMap); - } - if (imageData->stickyObj) { - Tcl_DecrRefCount(imageData->stickyObj); - } - if (imageData->borderObj) { - Tcl_DecrRefCount(imageData->borderObj); - } - if (imageData->paddingObj) { - Tcl_DecrRefCount(imageData->paddingObj); - } + if (imageData->imageMap) { Tcl_DecrRefCount(imageData->imageMap); } + if (imageData->stickyObj) { Tcl_DecrRefCount(imageData->stickyObj); } + if (imageData->borderObj) { Tcl_DecrRefCount(imageData->borderObj); } + if (imageData->paddingObj) { Tcl_DecrRefCount(imageData->paddingObj); } ckfree(clientData); } |