diff options
author | treectrl <treectrl> | 2002-12-18 20:33:17 (GMT) |
---|---|---|
committer | treectrl <treectrl> | 2002-12-18 20:33:17 (GMT) |
commit | e29fde86c0bf508e502e0aef595b69e9f3f298b7 (patch) | |
tree | d96c9f8d0a2ba389786b8d22d2f39c87878efacd /generic | |
parent | 051cf743615a2498f4b42568d631408ada02ad3c (diff) | |
download | tktreectrl-e29fde86c0bf508e502e0aef595b69e9f3f298b7.zip tktreectrl-e29fde86c0bf508e502e0aef595b69e9f3f298b7.tar.gz tktreectrl-e29fde86c0bf508e502e0aef595b69e9f3f298b7.tar.bz2 |
Replaced GNU __FUNCTION__ with ANSI __FILE__ and __LINE__.
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tkTreeItem.c | 9 | ||||
-rw-r--r-- | generic/tkTreeStyle.c | 12 |
2 files changed, 6 insertions, 15 deletions
diff --git a/generic/tkTreeItem.c b/generic/tkTreeItem.c index 89cdf42..0aa736b 100644 --- a/generic/tkTreeItem.c +++ b/generic/tkTreeItem.c @@ -288,10 +288,7 @@ int TreeItem_GetDepth(TreeCtrl *tree, TreeItem item_) Item *item = (Item *) item_; #if 0 if (tree->updateIndex) - { - if (tree->debug.enable && tree->debug.data) dbwin("%s: ", __FUNCTION__); Tree_UpdateItemIndex(tree); - } #endif return item->depth; } @@ -495,10 +492,7 @@ void TreeItem_ToIndex(TreeCtrl *tree, TreeItem item_, int *index, int *indexVis) Item *item = (Item *) item_; if (tree->updateIndex) - { - if (tree->debug.enable && tree->debug.data) dbwin("%s: ", __FUNCTION__); Tree_UpdateItemIndex(tree); - } if (index != NULL) (*index) = item->index; if (indexVis != NULL) (*indexVis) = item->indexVis; } @@ -1367,10 +1361,7 @@ int TreeItem_Indent(TreeCtrl *tree, TreeItem item_) return (tree->showRoot && tree->showButtons && tree->showRootButton) ? tree->useIndent : 0; if (tree->updateIndex) - { - if (tree->debug.enable && tree->debug.data) dbwin("%s: ", __FUNCTION__); Tree_UpdateItemIndex(tree); - } indent = tree->useIndent * self->depth; if (tree->showRoot || tree->showButtons || tree->showLines) diff --git a/generic/tkTreeStyle.c b/generic/tkTreeStyle.c index 08dbee4..15b06c8 100644 --- a/generic/tkTreeStyle.c +++ b/generic/tkTreeStyle.c @@ -1190,14 +1190,14 @@ static void Style_DoLayout2(StyleDrawArgs *drawArgs, struct Layout layouts[20]) } /* Arrange all the Elements considering drawArgs.width and drawArgs.height */ -static void Style_DoLayout(StyleDrawArgs *drawArgs, struct Layout layouts[20], char *function) +static void Style_DoLayout(StyleDrawArgs *drawArgs, struct Layout layouts[20], char *file, int line) { TreeCtrl *tree = drawArgs->tree; Style *style = (Style *) drawArgs->style; int state = drawArgs->state; int i; - if (style->neededWidth == -1) panic("Style_DoLayout(from %s): style.neededWidth == -1", function); + if (style->neededWidth == -1) panic("Style_DoLayout(file %s line %d): style.neededWidth == -1", file, line); if (style->minWidth > drawArgs->width) panic("Style_DoLayout: style.minWidth %d > drawArgs.width %d", style->minWidth, drawArgs->width); Style_DoLayoutH(drawArgs, layouts); @@ -1473,7 +1473,7 @@ void TreeStyle_Draw(StyleDrawArgs *drawArgs) if (drawArgs->height < style->minHeight) drawArgs->height = style->minHeight; - Style_DoLayout(drawArgs, layouts, __FUNCTION__); + Style_DoLayout(drawArgs, layouts, __FILE__, __LINE__); args.tree = tree; args.state = drawArgs->state; @@ -3248,7 +3248,7 @@ char *TreeStyle_Identify(StyleDrawArgs *drawArgs, int x, int y) drawArgs->height = style->minHeight; x -= drawArgs->x; - Style_DoLayout(drawArgs, layouts, __FUNCTION__); + Style_DoLayout(drawArgs, layouts, __FILE__, __LINE__); for (i = style->numElements - 1; i >= 0; i--) { @@ -3285,7 +3285,7 @@ void TreeStyle_Identify2(StyleDrawArgs *drawArgs, if (drawArgs->height < style->minHeight) drawArgs->height = style->minHeight; - Style_DoLayout(drawArgs, layouts, __FUNCTION__); + Style_DoLayout(drawArgs, layouts, __FILE__, __LINE__); for (i = style->numElements - 1; i >= 0; i--) { @@ -3469,7 +3469,7 @@ int TreeStyle_GetElemRects(StyleDrawArgs *drawArgs, int objc, if (drawArgs->height < style->minHeight) drawArgs->height = style->minHeight; - Style_DoLayout(drawArgs, layouts, __FUNCTION__); + Style_DoLayout(drawArgs, layouts, __FILE__, __LINE__); for (i = style->numElements - 1; i >= 0; i--) { |