summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authortreectrl <treectrl>2006-12-04 05:49:54 (GMT)
committertreectrl <treectrl>2006-12-04 05:49:54 (GMT)
commiteb245fc809c554e478766fc7c5fd40c299857416 (patch)
tree90f21d8aa3eba965dd85907bbaac5377a1814c0b /generic
parentfab671891e2c301364057ec0bf0464d516d9cd3a (diff)
downloadtktreectrl-eb245fc809c554e478766fc7c5fd40c299857416.zip
tktreectrl-eb245fc809c554e478766fc7c5fd40c299857416.tar.gz
tktreectrl-eb245fc809c554e478766fc7c5fd40c299857416.tar.bz2
Add missing checks of tree->useTheme.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkTreeDisplay.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/generic/tkTreeDisplay.c b/generic/tkTreeDisplay.c
index e63db50..b7e63af 100644
--- a/generic/tkTreeDisplay.c
+++ b/generic/tkTreeDisplay.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 2002-2006 Tim Baker
*
- * RCS: @(#) $Id: tkTreeDisplay.c,v 1.71 2006/12/04 01:40:20 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeDisplay.c,v 1.72 2006/12/04 05:49:54 treectrl Exp $
*/
#include "tkTreeCtrl.h"
@@ -5783,7 +5783,9 @@ displayRetry:
dInfo->flags |= DINFO_DRAW_HIGHLIGHT | DINFO_DRAW_BORDER;
if (dInfo->flags & (DINFO_DRAW_BORDER | DINFO_DRAW_HIGHLIGHT)) {
- if (TreeTheme_DrawBorders(tree, drawable) != TCL_OK) {
+ if (tree->useTheme && TreeTheme_DrawBorders(tree, drawable) == TCL_OK) {
+ /* nothing */
+ } else {
/* Draw focus rectangle (outside of 3D-border) */
if ((dInfo->flags & DINFO_DRAW_HIGHLIGHT) &&
@@ -6461,8 +6463,10 @@ Tree_RelayoutWindow(
dInfo->pixmap = None;
}
- TreeTheme_Relayout(tree);
- TreeTheme_SetBorders(tree);
+ if (tree->useTheme) {
+ TreeTheme_Relayout(tree);
+ TreeTheme_SetBorders(tree);
+ }
Tree_EventuallyRedraw(tree);
}