Rename typedef Ttk_Element => Ttk_ElementImpl.

7 files changed, 30 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index a6717b2..97a00bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-10  Joe English  <jenglish@users.sourceforge.net>
+
+	* generic/ttk/ttkTheme.h, generic/ttk/ttkThemeInt.h,
+	generic/ttk/ttk.decls, generic/ttk/ttkTheme.c,
+	generic/ttk/ttkLayout.c, generic/ttk/ttkDecls.h: 
+	Rename typedef Ttk_Element => Ttk_ElementImpl.
+
 2006-12-09  Joe English  <jenglish@users.sourceforge.net>
 
 	* generic/ttk/ttkButton.c, generic/ttk/ttkImage.c,
diff --git a/generic/ttk/ttk.decls b/generic/ttk/ttk.decls
index 64820cd..b3f2538 100644
--- a/generic/ttk/ttk.decls
+++ b/generic/ttk/ttk.decls
@@ -1,5 +1,5 @@
 #
-# $Id: ttk.decls,v 1.1 2006/10/31 01:42:26 hobbs Exp $
+# $Id: ttk.decls,v 1.2 2006/12/10 19:19:44 jenglish Exp $
 #
 
 library 	ttk
@@ -34,7 +34,7 @@ declare 5 current {
 }
 
 declare 6 current {
-    Ttk_Element Ttk_RegisterElement(
+    Ttk_ElementImpl Ttk_RegisterElement(
 	Tcl_Interp *interp,
 	Ttk_Theme theme, 
 	const char *elementName,
diff --git a/generic/ttk/ttkDecls.h b/generic/ttk/ttkDecls.h
index 743c056..0c7d57c 100644
--- a/generic/ttk/ttkDecls.h
+++ b/generic/ttk/ttkDecls.h
@@ -1,5 +1,5 @@
 /*
- * $Id: ttkDecls.h,v 1.2 2006/11/03 03:06:22 das Exp $
+ * $Id: ttkDecls.h,v 1.3 2006/12/10 19:19:44 jenglish Exp $
  *
  * This file is (mostly) automatically generated from ttk.decls.
  */
@@ -50,7 +50,7 @@ TTKAPI int		Ttk_RegisterElementSpec (Ttk_Theme theme,
 				Ttk_ElementSpec * elementSpec, 
 				void * clientData);
 /* 6 */
-TTKAPI Ttk_Element	Ttk_RegisterElement (Tcl_Interp * interp, 
+TTKAPI Ttk_ElementImpl	Ttk_RegisterElement (Tcl_Interp * interp, 
 				Ttk_Theme theme, const char * elementName, 
 				Ttk_ElementSpec * elementSpec, 
 				void * clientData);
@@ -147,7 +147,7 @@ typedef struct TtkStubs {
     Ttk_Theme (*ttk_CreateTheme) (Tcl_Interp * interp, const char * name, Ttk_Theme parent); /* 3 */
     void (*ttk_RegisterCleanup) (Tcl_Interp * interp, void * deleteData, Ttk_CleanupProc * cleanupProc); /* 4 */
     int (*ttk_RegisterElementSpec) (Ttk_Theme theme, const char * elementName, Ttk_ElementSpec * elementSpec, void * clientData); /* 5 */
-    Ttk_Element (*ttk_RegisterElement) (Tcl_Interp * interp, Ttk_Theme theme, const char * elementName, Ttk_ElementSpec * elementSpec, void * clientData); /* 6 */
+    Ttk_ElementImpl (*ttk_RegisterElement) (Tcl_Interp * interp, Ttk_Theme theme, const char * elementName, Ttk_ElementSpec * elementSpec, void * clientData); /* 6 */
     int (*ttk_RegisterElementFactory) (Tcl_Interp * interp, const char * name, Ttk_ElementFactory factoryProc, void * clientData); /* 7 */
     void (*ttk_RegisterLayout) (Ttk_Theme theme, const char * className, Ttk_LayoutSpec layoutSpec); /* 8 */
     void (*reserved9)(void);
diff --git a/generic/ttk/ttkLayout.c b/generic/ttk/ttkLayout.c
index 12f372a..ef4f7b1 100644
--- a/generic/ttk/ttkLayout.c
+++ b/generic/ttk/ttkLayout.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2003 Joe English.  Freely redistributable.
  *
- * $Id: ttkLayout.c,v 1.4 2006/12/01 15:05:28 jenglish Exp $
+ * $Id: ttkLayout.c,v 1.5 2006/12/10 19:19:44 jenglish Exp $
  */
 
 #include <string.h>
@@ -516,13 +516,13 @@ Tcl_Obj *Ttk_NewStickyObj(Ttk_Sticky sticky)
 struct Ttk_LayoutNode_
 {
     unsigned		flags;		/* Packing and sticky flags */
-    Ttk_Element 	element;	/* Element implementation */
+    Ttk_ElementImpl 	element;	/* Element implementation */
     Ttk_State 	 	state;		/* Current state */
     Ttk_Box 		parcel;		/* allocated parcel */
     Ttk_LayoutNode	*next, *child;
 };
 
-static Ttk_LayoutNode *Ttk_NewLayoutNode(unsigned flags, Ttk_Element element)
+static Ttk_LayoutNode *Ttk_NewLayoutNode(unsigned flags, Ttk_ElementImpl element)
 {
     Ttk_LayoutNode *node = (Ttk_LayoutNode*)ckalloc(sizeof(Ttk_LayoutNode));
 
@@ -581,7 +581,7 @@ void Ttk_FreeLayoutTemplate(Ttk_LayoutTemplate op)
 static Ttk_LayoutNode *
 Ttk_InstantiateLayout(Ttk_Theme theme, Ttk_TemplateNode *op)
 {
-    Ttk_Element elementImpl = Ttk_GetElement(theme, op->name);
+    Ttk_ElementImpl elementImpl = Ttk_GetElement(theme, op->name);
     Ttk_LayoutNode *node = Ttk_NewLayoutNode(op->flags, elementImpl);
 
     if (op->next) {
@@ -849,7 +849,7 @@ Ttk_Layout Ttk_CreateLayout(
     Ttk_Style style = Ttk_GetStyle(themePtr, styleName);
     Ttk_LayoutTemplate layoutTemplate =
 	Ttk_FindLayoutTemplate(themePtr,styleName);
-    Ttk_Element bgelement = Ttk_GetElement(themePtr, "background");
+    Ttk_ElementImpl bgelement = Ttk_GetElement(themePtr, "background");
     Ttk_LayoutNode *bgnode;
 
     if (!layoutTemplate) {
diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c
index cca5d3a..305445d 100644
--- a/generic/ttk/ttkTheme.c
+++ b/generic/ttk/ttkTheme.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * $Id: ttkTheme.c,v 1.3 2006/11/07 03:45:28 jenglish Exp $
+ * $Id: ttkTheme.c,v 1.4 2006/12/10 19:19:44 jenglish Exp $
  */
 
 #include <stdlib.h>
@@ -753,7 +753,7 @@ const char *Ttk_StyleName(Ttk_Style stylePtr)
  *	repeat the lookups in the parent theme.
  *	If not found, return the null element.
  */
-Ttk_Element Ttk_GetElement(Ttk_Theme themePtr, const char *elementName)
+Ttk_ElementImpl Ttk_GetElement(Ttk_Theme themePtr, const char *elementName)
 {
     Tcl_HashEntry *entryPtr;
     const char *dot = elementName;
@@ -763,7 +763,7 @@ Ttk_Element Ttk_GetElement(Ttk_Theme themePtr, const char *elementName)
      */
     entryPtr = Tcl_FindHashEntry(&themePtr->elementTable, elementName);
     if (entryPtr) {
-	return (Ttk_Element)Tcl_GetHashValue(entryPtr);
+	return (Ttk_ElementImpl)Tcl_GetHashValue(entryPtr);
     }
 
     /*
@@ -790,7 +790,7 @@ Ttk_Element Ttk_GetElement(Ttk_Theme themePtr, const char *elementName)
      */
     entryPtr = Tcl_FindHashEntry(&themePtr->elementTable, "");
     /* ASSERT: entryPtr != 0 */
-    return (Ttk_Element)Tcl_GetHashValue(entryPtr);
+    return (Ttk_ElementImpl)Tcl_GetHashValue(entryPtr);
 }
 
 const char *Ttk_ElementName(ElementImpl *elementImpl)
@@ -870,7 +870,7 @@ static int Ttk_CloneElement(
  *	if interp is non-NULL.
  */
 
-Ttk_Element Ttk_RegisterElement(
+Ttk_ElementImpl Ttk_RegisterElement(
     Tcl_Interp *interp,		/* Where to leave error messages */
     Ttk_Theme theme,		/* Style engine providing the implementation. */
     const char *name,		/* Name of new element */
diff --git a/generic/ttk/ttkTheme.h b/generic/ttk/ttkTheme.h
index 27f1e5b..367c0ee 100644
--- a/generic/ttk/ttkTheme.h
+++ b/generic/ttk/ttkTheme.h
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 2003 Joe English.  Freely redistributable.
  *
- * $Id: ttkTheme.h,v 1.5 2006/12/09 20:53:35 jenglish Exp $
+ * $Id: ttkTheme.h,v 1.6 2006/12/10 19:19:44 jenglish Exp $
  */
 
 #ifndef _TTKTHEME
@@ -218,7 +218,7 @@ MODULE_SCOPE Ttk_Box Ttk_PositionBox(Ttk_Box *cavity, int w, int h, Ttk_Position
 MODULE_SCOPE void Ttk_StylePkgInit(Tcl_Interp *);
 
 typedef struct Ttk_Theme_ *Ttk_Theme;
-typedef struct Ttk_ElementImpl_ *Ttk_Element;
+typedef struct Ttk_ElementImpl_ *Ttk_ElementImpl;
 typedef struct Ttk_Layout_ *Ttk_Layout;
 typedef struct Ttk_LayoutNode_ Ttk_LayoutNode;
 
@@ -267,7 +267,7 @@ typedef struct Ttk_ElementSpec {
     Ttk_ElementDrawProc *draw;  	/* Draw the element */
 } Ttk_ElementSpec;
 
-TTKAPI Ttk_Element Ttk_RegisterElement(
+TTKAPI Ttk_ElementImpl Ttk_RegisterElement(
 	Tcl_Interp *interp, Ttk_Theme theme, const char *elementName,
 	Ttk_ElementSpec *, void *clientData);
 
diff --git a/generic/ttk/ttkThemeInt.h b/generic/ttk/ttkThemeInt.h
index 9915714..9a904de 100644
--- a/generic/ttk/ttkThemeInt.h
+++ b/generic/ttk/ttkThemeInt.h
@@ -1,5 +1,5 @@
 /*
- * $Id: ttkThemeInt.h,v 1.2 2006/11/03 03:06:22 das Exp $
+ * $Id: ttkThemeInt.h,v 1.3 2006/12/10 19:19:44 jenglish Exp $
  *
  * Theme engine: private definitions.
  *
@@ -14,15 +14,15 @@
 typedef struct Ttk_Style_ *Ttk_Style;
 typedef struct Ttk_TemplateNode_ Ttk_TemplateNode, *Ttk_LayoutTemplate;
 
-MODULE_SCOPE Ttk_Element Ttk_GetElement(Ttk_Theme theme, const char *name);
-MODULE_SCOPE const char *Ttk_ElementName(Ttk_Element);
+MODULE_SCOPE Ttk_ElementImpl Ttk_GetElement(Ttk_Theme theme, const char *name);
+MODULE_SCOPE const char *Ttk_ElementName(Ttk_ElementImpl);
 
 MODULE_SCOPE void Ttk_ElementSize(
-	Ttk_Element element, Ttk_Style, char *recordPtr, Tk_OptionTable,
+	Ttk_ElementImpl element, Ttk_Style, char *recordPtr, Tk_OptionTable,
 	Tk_Window tkwin, Ttk_State state,
 	int *widthPtr, int *heightPtr, Ttk_Padding*);
 MODULE_SCOPE void Ttk_DrawElement(
-	Ttk_Element element, Ttk_Style, char *recordPtr, Tk_OptionTable,
+	Ttk_ElementImpl element, Ttk_Style, char *recordPtr, Tk_OptionTable,
 	Tk_Window tkwin, Drawable d, Ttk_Box b, Ttk_State state);
 
 MODULE_SCOPE Tcl_Obj *Ttk_QueryStyle(