summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2012-02-28 13:45:01 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2012-02-28 13:45:01 (GMT)
commitad992d2c5a96ddc30f78aac1d3e5484b064e9808 (patch)
treedb6a5591204c41997c60fbe73046df3ef1d2162c
parent672ad30f66fb7d68caca7ccfd50dfa6abfc551d2 (diff)
downloadtk-ad992d2c5a96ddc30f78aac1d3e5484b064e9808.zip
tk-ad992d2c5a96ddc30f78aac1d3e5484b064e9808.tar.gz
tk-ad992d2c5a96ddc30f78aac1d3e5484b064e9808.tar.bz2
[Bug 3495198]: Corrected types of canvas bitmap options.
-rw-r--r--ChangeLog4
-rw-r--r--doc/canvas.n8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a10b58..ab86304 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-28 Donal K. Fellows <dkf@users.sf.net>
+
+ * doc/canvas.n: [Bug 3495198]: Corrected types of bitmap options.
+
2012-02-26 Jan Nijtmans <nijtmans@users.sf.net>
* xlib/xcolors.c: Provide fallback for _strtoi64
diff --git a/doc/canvas.n b/doc/canvas.n
index 6a308a0..5ea3035 100644
--- a/doc/canvas.n
+++ b/doc/canvas.n
@@ -1246,9 +1246,9 @@ This option defaults to \fBcenter\fR.
.TP
\fB\-background \fIcolor\fR
.TP
-\fB\-activebackground \fIbitmap\fR
+\fB\-activebackground \fIcolor\fR
.TP
-\fB\-disabledbackground \fIbitmap\fR
+\fB\-disabledbackground \fIcolor\fR
Specifies the color to use for each of the bitmap's '0' valued pixels
in its normal, active and disabled states.
\fIColor\fR may have any of the forms accepted by \fBTk_GetColor\fR.
@@ -1267,9 +1267,9 @@ disabled states.
.TP
\fB\-foreground \fIcolor\fR
.TP
-\fB\-activeforeground \fIbitmap\fR
+\fB\-activeforeground \fIcolor\fR
.TP
-\fB\-disabledforeground \fIbitmap\fR
+\fB\-disabledforeground \fIcolor\fR
Specifies the color to use for each of the bitmap's '1' valued pixels
in its normal, active and disabled states.
\fIColor\fR may have any of the forms accepted by \fBTk_GetColor\fR and