* doc/ttk_Geometry.3, doc/ttk_Theme.3, doc/ttk_button.n:

	* doc/ttk_checkbutton.n, doc/ttk_combobox.n, doc/ttk_dialog.n:
	* doc/ttk_entry.n, doc/ttk_frame.n, doc/ttk_image.n:
	* doc/ttk_intro.n, doc/ttk_label.n, doc/ttk_labelframe.n:
	* doc/ttk_menubutton.n, doc/ttk_notebook.n, doc/ttk_panedwindow.n:
	* doc/ttk_progressbar.n, doc/ttk_radiobutton.n, doc/ttk_scrollbar.n:
	* doc/ttk_separator.n, doc/ttk_sizegrip.n, doc/ttk_style.n:
	* doc/ttk_treeview.n, doc/ttk_widget.n,:
	* generic/ttk/ttk.decls, generic/ttk/ttkBlink.c:
	* generic/ttk/ttkButton.c, generic/ttk/ttkCache.c:
	* generic/ttk/ttkClamTheme.c, generic/ttk/ttkClassicTheme.c:
	* generic/ttk/ttkDecls.h, generic/ttk/ttkDefaultTheme.c:
	* generic/ttk/ttkElements.c, generic/ttk/ttkEntry.c:
	* generic/ttk/ttkFrame.c, generic/ttk/ttkImage.c:
	* generic/ttk/ttkInit.c, generic/ttk/ttkLabel.c:
	* generic/ttk/ttkLayout.c, generic/ttk/ttkManager.c:
	* generic/ttk/ttkManager.h, generic/ttk/ttkNotebook.c:
	* generic/ttk/ttkPanedwindow.c, generic/ttk/ttkProgress.c:
	* generic/ttk/ttkScale.c, generic/ttk/ttkScroll.c:
	* generic/ttk/ttkScrollbar.c, generic/ttk/ttkSeparator.c:
	* generic/ttk/ttkSquare.c, generic/ttk/ttkState.c:
	* generic/ttk/ttkStubInit.c, generic/ttk/ttkStubLib.c:
	* generic/ttk/ttkTagSet.c, generic/ttk/ttkTheme.c:
	* generic/ttk/ttkTheme.h, generic/ttk/ttkThemeInt.h:
	* generic/ttk/ttkTrace.c, generic/ttk/ttkTrack.c:
	* generic/ttk/ttkTreeview.c, generic/ttk/ttkWidget.c:
	* generic/ttk/ttkWidget.h:
	* library/demos/ttk_demo.tcl, library/demos/ttk_iconlib.tcl:
	* library/demos/ttk_repeater.tcl:
	* library/ttk/altTheme.tcl, library/ttk/aquaTheme.tcl:
	* library/ttk/button.tcl, library/ttk/clamTheme.tcl:
	* library/ttk/classicTheme.tcl, library/ttk/combobox.tcl:
	* library/ttk/cursors.tcl, library/ttk/defaults.tcl:
	* library/ttk/dialog.tcl, library/ttk/entry.tcl:
	* library/ttk/fonts.tcl, library/ttk/icons.tcl:
	* library/ttk/keynav.tcl, library/ttk/menubutton.tcl:
	* library/ttk/notebook.tcl, library/ttk/panedwindow.tcl:
	* library/ttk/progress.tcl, library/ttk/scale.tcl:
	* library/ttk/scrollbar.tcl, library/ttk/sizegrip.tcl:
	* library/ttk/treeview.tcl, library/ttk/ttk.tcl:
	* library/ttk/utils.tcl, library/ttk/winTheme.tcl:
	* library/ttk/xpTheme.tcl:
	* macosx/ttkMacOSXTheme.c:
	* tests/ttk/all.tcl, tests/ttk/bwidget.test, tests/ttk/combobox.test:
	* tests/ttk/entry.test, tests/ttk/image.test:
	* tests/ttk/labelframe.test, tests/ttk/layout.test:
	* tests/ttk/misc.test, tests/ttk/notebook.test:
	* tests/ttk/panedwindow.test, tests/ttk/progressbar.test:
	* tests/ttk/scrollbar.test, tests/ttk/treetags.test:
	* tests/ttk/treeview.test, tests/ttk/ttk.test, tests/ttk/validate.test:
	* win/ttkWinMonitor.c, win/ttkWinTheme.c, win/ttkWinXPTheme.c:
	First import of Ttk themed Tk widgets as branched from tile 0.7.8

	* generic/tkInt.h, generic/tkWindow.c: add Ttk_Init call, copy
	tk classic widgets to ::tk namespace.
	* library/tk.tcl: add source of ttk/ttk.tcl, define $::ttk::library.
	* unix/Makefile.in, win/Makefile.in: add Ttk build bits
	* win/configure, win/configure.in: check for uxtheme.h (XP theme).

1 files changed, 147 insertions, 0 deletions

diff --git a/generic/ttk/ttkTagSet.c b/generic/ttk/ttkTagSet.c
new file mode 100644
index 0000000..dd4d3a4
--- /dev/null
+++ b/generic/ttk/ttkTagSet.c
@@ -0,0 +1,147 @@
+/* $Id: ttkTagSet.c,v 1.1 2006/10/31 01:42:26 hobbs Exp $
+ *
+ * Ttk widget set: tag tables.  Half-baked, work in progress.
+ *
+ * Copyright (C) 2005, Joe English.  Freely redistributable.
+ */
+
+#include <string.h>	/* for memset() */
+#include <tcl.h>
+#include <tk.h>
+
+#include "ttkTheme.h"
+#include "ttkWidget.h"
+
+/*------------------------------------------------------------------------
+ * +++ Internal data structures.
+ */
+struct TtkTag {
+    Tcl_Obj **tagRecord;	/* ... hrmph. */
+};
+
+struct TtkTagTable {
+    Tk_OptionTable	tagOptionTable;	/* ... */
+    int         	tagRecordSize;	/* size of tag record */
+    Tcl_HashTable	tags;		/* defined tags */
+};
+
+/*------------------------------------------------------------------------
+ * +++ Tags.
+ */
+static Ttk_Tag NewTag(Ttk_TagTable tagTable)
+{
+    Ttk_Tag tag = (Ttk_Tag)ckalloc(sizeof(*tag));
+    tag->tagRecord = (Tcl_Obj **)ckalloc(tagTable->tagRecordSize);
+    memset(tag->tagRecord, 0, tagTable->tagRecordSize);
+    return tag;
+}
+
+static void DeleteTag(Ttk_Tag tag, int nOptions) 
+{
+    int i;
+    for (i = 0; i < nOptions; ++i) {
+	if (tag->tagRecord[i]) {
+	    Tcl_DecrRefCount(tag->tagRecord[i]);
+	}
+    }
+    ckfree((void*)tag->tagRecord);
+    ckfree((void*)tag);
+}
+
+Tcl_Obj **Ttk_TagRecord(Ttk_Tag tag)
+{
+    return tag->tagRecord;
+}
+
+/*------------------------------------------------------------------------
+ * +++ Tag tables.
+ */
+
+Ttk_TagTable Ttk_CreateTagTable(
+    Tk_OptionTable tagOptionTable, int tagRecordSize)
+{
+    Ttk_TagTable tagTable = (Ttk_TagTable)ckalloc(sizeof(*tagTable));
+    tagTable->tagOptionTable = tagOptionTable;
+    tagTable->tagRecordSize = tagRecordSize;
+    Tcl_InitHashTable(&tagTable->tags, TCL_STRING_KEYS);
+    return tagTable;
+}
+
+void Ttk_DeleteTagTable(Ttk_TagTable tagTable)
+{
+    Tcl_HashSearch search;
+    Tcl_HashEntry *entryPtr;
+    int nOptions = tagTable->tagRecordSize / sizeof(Tcl_Obj *);
+
+    entryPtr = Tcl_FirstHashEntry(&tagTable->tags, &search);
+    while (entryPtr != NULL) {
+	DeleteTag(Tcl_GetHashValue(entryPtr), nOptions);
+	entryPtr = Tcl_NextHashEntry(&search);
+    }
+
+    Tcl_DeleteHashTable(&tagTable->tags);
+    ckfree((void*)tagTable);
+}
+
+Ttk_Tag Ttk_GetTag(Ttk_TagTable tagTable, const char *tagName)
+{
+    int isNew = 0;
+    Tcl_HashEntry *entryPtr = Tcl_CreateHashEntry(
+	&tagTable->tags, tagName, &isNew);
+
+    if (isNew) {
+	Tcl_SetHashValue(entryPtr, NewTag(tagTable));
+    }
+    return Tcl_GetHashValue(entryPtr);
+}
+
+Ttk_Tag Ttk_GetTagFromObj(Ttk_TagTable tagTable, Tcl_Obj *objPtr)
+{
+    return Ttk_GetTag(tagTable, Tcl_GetString(objPtr));
+}
+
+/* Ttk_GetTagListFromObj --
+ * 	Extract an array of pointers to Ttk_Tags from a Tcl_Obj.
+ * 	(suitable for passing to Tk_BindEvent).
+ *
+ * Result must be passed to Ttk_FreeTagList().
+ */
+extern int Ttk_GetTagListFromObj(
+    Tcl_Interp *interp, 
+    Ttk_TagTable tagTable,
+    Tcl_Obj *objPtr,
+    int *nTags_rtn,
+    void **taglist_rtn)
+{
+    Tcl_Obj **objv;
+    int i, objc;
+    void **tags;
+
+    *taglist_rtn = NULL; *nTags_rtn = 0;
+
+    if (objPtr == NULL) {
+	return TCL_OK;
+    }
+
+    if (Tcl_ListObjGetElements(interp, objPtr, &objc, &objv) != TCL_OK) {
+    	return TCL_ERROR;
+    }
+
+    tags = (void**)ckalloc((objc+1) * sizeof(void*));
+    for (i=0; i<objc; ++i) {
+	tags[i] = Ttk_GetTagFromObj(tagTable, objv[i]);
+    }
+    tags[i] = NULL;
+
+    *taglist_rtn = tags;
+    *nTags_rtn = objc;
+
+    return TCL_OK;
+}
+
+void Ttk_FreeTagList(void **taglist)
+{
+    if (taglist) 
+	ckfree((ClientData)taglist);
+}
+