* 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, 132 insertions, 0 deletions

diff --git a/library/ttk/fonts.tcl b/library/ttk/fonts.tcl
new file mode 100644
index 0000000..c3d4d50
--- /dev/null
+++ b/library/ttk/fonts.tcl
@@ -0,0 +1,132 @@
+#
+# $Id: fonts.tcl,v 1.1 2006/10/31 01:42:27 hobbs Exp $
+#
+# Ttk package: Font specifications.
+#
+# This file, [source]d from ttk.tcl when the package is loaded,
+# sets up the following symbolic fonts based on the current platform:
+#
+# TkDefaultFont	-- default for GUI items not otherwise specified
+# TkTextFont	-- font for user text (entry, listbox, others). [not in #145]
+# TkHeadingFont	-- headings (column headings, etc) [not in #145]
+# TkCaptionFont -- dialog captions (primary text in alert dialogs, etc.)
+# TkTooltipFont	-- font to use for tooltip windows
+#
+# This is a temporary solution until TIP #145 is implemented.
+#
+# Symbolic fonts listed in TIP #145:
+#
+# TkDefaultFont	-- the default for all GUI items not otherwise specified.
+# TkFixedFont	-- standard fixed width font [not used in Ttk]
+# TkMenuFont	-- used for menu items [not used in Ttk]
+# TkCaptionFont	-- used for window and dialog caption bars [different in Ttk]
+# TkSmallCaptionFont -- captions on contained windows or tool dialogs [not used]
+# TkIconFont	-- font in use for icon captions [not used in Ttk]
+# TkTooltipFont	-- font to use for tooltip windows
+# 
+#
+# +++ Platform notes:
+#
+# Windows:
+#	The default system font changed from "MS Sans Serif" to "Tahoma"
+# 	in Windows XP/Windows 2000.
+#
+#	MS documentation says to use "Tahoma 8" in Windows 2000/XP,
+#	although many MS programs still use "MS Sans Serif 8"
+#
+#	Should use SystemParametersInfo() instead.
+#
+# Mac OSX / Aqua:
+#	Quoth the Apple HIG: 
+#	The _system font_ (Lucida Grande Regular 13 pt) is used for text 
+#	in menus, dialogs, and full-size controls.
+#	[...] Use the _view font_ (Lucida Grande Regular 12pt) as the default 
+#	font of text in lists and tables.
+#	[...] Use the _emphasized system font_ (Lucida Grande Bold 13 pt)
+#	sparingly. It is used for the message text in alerts.
+#	[...] The _small system font_ (Lucida Grande Regular 11 pt) [...]
+#	is also the default font for column headings in lists, for help tags,
+#	and for small controls.
+#
+#	Note that the font for column headings (TkHeadingFont) is
+#	_smaller_ than the 
+#
+#	There's also a GetThemeFont() Appearance Manager API call 
+#	for looking up kThemeSystemFont dynamically.
+#
+# Mac classic:
+#	Don't know, can't find *anything* on the Web about Mac pre-OSX.
+#	Might have used Geneva.  Doesn't matter, this platform
+#	isn't supported anymore anyway.
+#
+# X11:
+#	Need a way to tell if Xft is enabled or not.
+#	For now, assume patch #971980 applied.
+#
+#	"Classic" look used Helvetica bold for everything except
+#	for entry widgets, which use Helvetica medium.
+#	Most other toolkits use medium weight for all UI elements,
+#	which is what we do now.
+#
+#	Font size specified in pixels on X11, not points.
+#	This is Theoretically Wrong, but in practice works better; using
+#	points leads to huge inconsistencies across different servers.
+#
+
+namespace eval ttk {
+
+catch {font create TkDefaultFont}
+catch {font create TkTextFont}
+catch {font create TkHeadingFont}
+catch {font create TkCaptionFont}
+catch {font create TkTooltipFont}
+
+switch -- [tk windowingsystem] {
+    win32 {
+	if {$tcl_platform(osVersion) >= 5.0} {
+	    variable family "Tahoma"
+	} else {
+	    variable family "MS Sans Serif"
+	}
+	variable size 8
+
+	font configure TkDefaultFont -family $family -size $size
+	font configure TkTextFont    -family $family -size $size
+	font configure TkHeadingFont -family $family -size $size
+	font configure TkCaptionFont -family $family -size $size -weight bold
+	font configure TkTooltipFont -family $family -size $size
+    }
+    classic -
+    aqua {
+	variable family "Lucida Grande"
+	variable size 13
+	variable viewsize 12
+	variable smallsize 11
+
+	font configure TkDefaultFont -family $family -size $size
+	font configure TkTextFont    -family $family -size $size
+	font configure TkHeadingFont -family $family -size $smallsize
+	font configure TkCaptionFont -family $family -size $size -weight bold
+	font configure TkTooltipFont -family $family -size $viewsize
+    }
+    x11 {
+	if {![catch {tk::pkgconfig get fontsystem} fs] && $fs eq "xft"} {
+	    variable family "sans-serif"
+	} else {
+	    variable family "Helvetica"
+	}
+	variable size -12
+	variable ttsize -10
+	variable capsize -14
+
+	font configure TkDefaultFont -family $family -size $size
+	font configure TkTextFont    -family $family -size $size
+	font configure TkHeadingFont -family $family -size $size -weight bold
+	font configure TkCaptionFont -family $family -size $capsize -weight bold
+	font configure TkTooltipFont -family $family -size $ttsize
+    }
+}
+
+}
+
+#*EOF*