summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2007-06-21 16:02:24 (GMT)
committerdgp <dgp@users.sourceforge.net>2007-06-21 16:02:24 (GMT)
commitaef9147803123cbd2e4a67306397248b60b4435d (patch)
treeb0182d5e2144d916e58e0b84b0c2b1faec901cc7
parente533770d061a74bb7d2e59f1fd3347fb70782bb9 (diff)
downloadtk-aef9147803123cbd2e4a67306397248b60b4435d.zip
tk-aef9147803123cbd2e4a67306397248b60b4435d.tar.gz
tk-aef9147803123cbd2e4a67306397248b60b4435d.tar.bz2
merge updates from HEAD
-rw-r--r--ChangeLog5
-rw-r--r--library/ttk/ttk.tcl4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4864d16..c2da3d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-20 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * library/ttk/ttk.tcl: should require Tk before pseudo-providing
+ tile 0.8.0.
+
2007-06-09 Joe English <jenglish@users.sourceforge.net>
* generic/ttk/ttkPanedwindow.c, doc/ttk_panedwindow.n,
diff --git a/library/ttk/ttk.tcl b/library/ttk/ttk.tcl
index b70c855..32cf782 100644
--- a/library/ttk/ttk.tcl
+++ b/library/ttk/ttk.tcl
@@ -1,5 +1,5 @@
#
-# $Id: ttk.tcl,v 1.5.2.1 2007/05/26 04:06:07 dgp Exp $
+# $Id: ttk.tcl,v 1.5.2.2 2007/06/21 16:02:24 dgp Exp $
#
# Ttk widget set initialization script.
#
@@ -45,7 +45,7 @@ proc ttk::deprecated'warning {old new} {
### Backward-compatibility.
#
-package ifneeded tile 0.8.0 { package provide tile 0.8.0 }
+package ifneeded tile 0.8.0 { package require Tk ; package provide tile 0.8.0 }
# ttk::panedwindow used to be named ttk::paned. Keep the alias for now.
#