diff options
| author | hobbs2 <hobbs2> | 2004-11-30 19:05:05 (GMT) |
|---|---|---|
| committer | hobbs2 <hobbs2> | 2004-11-30 19:05:05 (GMT) |
| commit | c536dcb6b7790049042b22d2ee4c585bcb4bb65a (patch) | |
| tree | 597576f32facb8d7f26d63d5fb22cb50dc749313 | |
| parent | ccf37d5a1038044eaa89552eb34ce63c58727481 (diff) | |
| download | tktreectrl-c536dcb6b7790049042b22d2ee4c585bcb4bb65a.zip tktreectrl-c536dcb6b7790049042b22d2ee4c585bcb4bb65a.tar.gz tktreectrl-c536dcb6b7790049042b22d2ee4c585bcb4bb65a.tar.bz2 | |
* generic/tkTreeElem.c: add "Elem" to a few names to prevent name
collision (notable CreateBitmap on Windows).
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tkTreeElem.c | 22 |
2 files changed, 16 insertions, 11 deletions
@@ -1,3 +1,8 @@ +2004-11-30 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * generic/tkTreeElem.c: add "Elem" to a few names to prevent name
+ collision (notable CreateBitmap on Windows).
+
2004-11-29 Jeff Hobbs <jeffh@ActiveState.com>
* generic/tkTreeItem.c, generic/tkTreeElem.c: whitespace police
diff --git a/generic/tkTreeElem.c b/generic/tkTreeElem.c index 648aa3f..4109a0f 100644 --- a/generic/tkTreeElem.c +++ b/generic/tkTreeElem.c @@ -5,7 +5,7 @@ * * Copyright (c) 2002-2004 Tim Baker * - * RCS: @(#) $Id: tkTreeElem.c,v 1.14 2004/11/29 20:31:36 hobbs2 Exp $ + * RCS: @(#) $Id: tkTreeElem.c,v 1.15 2004/11/30 19:05:05 hobbs2 Exp $ */ #include "tkTreeCtrl.h" @@ -926,7 +926,7 @@ static Tk_OptionSpec bitmapOptionSpecs[] = { (char *) NULL, 0, -1, 0, (ClientData) NULL, 0} }; -static void DeleteBitmap(ElementArgs *args) +static void ElemDeleteBitmap(ElementArgs *args) { TreeCtrl *tree = args->tree; Element *elem = args->elem; @@ -952,7 +952,7 @@ static int WorldChangedBitmap(ElementArgs *args) return mask; } -static int ConfigBitmap(ElementArgs *args) +static int ElemConfigBitmap(ElementArgs *args) { TreeCtrl *tree = args->tree; Element *elem = args->elem; @@ -1025,12 +1025,12 @@ static int ConfigBitmap(ElementArgs *args) return TCL_OK; } -static int CreateBitmap(ElementArgs *args) +static int ElemCreateBitmap(ElementArgs *args) { return TCL_OK; } -static void DisplayBitmap(ElementArgs *args) +static void ElemDisplayBitmap(ElementArgs *args) { TreeCtrl *tree = args->tree; Element *elem = args->elem; @@ -1109,7 +1109,7 @@ static void DisplayBitmap(ElementArgs *args) } } -static void LayoutBitmap(ElementArgs *args) +static void ElemLayoutBitmap(ElementArgs *args) { TreeCtrl *tree = args->tree; Element *elem = args->elem; @@ -1296,11 +1296,11 @@ ElementType elemTypeBitmap = { sizeof(ElementBitmap), bitmapOptionSpecs, NULL, - CreateBitmap, - DeleteBitmap, - ConfigBitmap, - DisplayBitmap, - LayoutBitmap, + ElemCreateBitmap, + ElemDeleteBitmap, + ElemConfigBitmap, + ElemDisplayBitmap, + ElemLayoutBitmap, WorldChangedBitmap, StateProcBitmap, UndefProcBitmap, |