summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
Diffstat (limited to 'Lib')
-rw-r--r--Lib/lib-tk/tkColorChooser.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/Lib/lib-tk/tkColorChooser.py b/Lib/lib-tk/tkColorChooser.py
index a3db41e..36df25b 100644
--- a/Lib/lib-tk/tkColorChooser.py
+++ b/Lib/lib-tk/tkColorChooser.py
@@ -9,6 +9,8 @@
#
# written by Fredrik Lundh, May 1997
#
+# fixed initialcolor handling in August 1998
+#
#
# options (all have default values):
@@ -21,10 +23,6 @@
# - title: dialog title
#
-# FIXME: as of Tk 8.0a2, the Unix colour picker is really ugly, and
-# doesn't seem to work properly on true colour displays. maybe we
-# should use the instant python version instead?
-
from tkCommonDialog import Dialog
@@ -42,7 +40,7 @@ class Chooser(Dialog):
color = self.options["initialcolor"]
if type(color) == type(()):
# assume an RGB triplet
- self.options["initialcolor"] = "%02x%02x%02x" % color
+ self.options["initialcolor"] = "#%02x%02x%02x" % color
except KeyError:
pass
@@ -61,6 +59,10 @@ class Chooser(Dialog):
def askcolor(color = None, **options):
"Ask for a color"
+ if color:
+ options = options.copy()
+ options["initialcolor"] = color
+
return apply(Chooser, (), options).show()