summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorericm <ericm>2000-07-28 16:41:40 (GMT)
committerericm <ericm>2000-07-28 16:41:40 (GMT)
commitbd8aa1f448a8d403362dc23e6b8e14570945e272 (patch)
treed02152b7dc634afcabb40048231221a29b35ba99
parenta5179966d79dc5e42d4da2132e363da240f49319 (diff)
downloadtk-bd8aa1f448a8d403362dc23e6b8e14570945e272.zip
tk-bd8aa1f448a8d403362dc23e6b8e14570945e272.tar.gz
tk-bd8aa1f448a8d403362dc23e6b8e14570945e272.tar.bz2
* doc/label.n: Added -disabledforeground to list of options [Bug: 6053].
* generic/tkListbox.c: Changed resource class for disabledforeground to "DisabledForeground".
-rw-r--r--ChangeLog3
-rw-r--r--doc/label.n14
-rw-r--r--generic/tkListbox.c7
3 files changed, 13 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 483d046..88b36c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2000-07-28 Eric Melski <ericm@ajubasolutions.com>
+ * doc/label.n: Added -disabledforeground to list of options [Bug:
+ 6053].
+
* mac/tkMacDefault.h:
* unix/tkUnixDefault.h: Added default values for listbox
disabledforeground and state.
diff --git a/doc/label.n b/doc/label.n
index edc426b..8464297 100644
--- a/doc/label.n
+++ b/doc/label.n
@@ -5,7 +5,7 @@
'\" See the file "license.terms" for information on usage and redistribution
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
'\"
-'\" RCS: @(#) $Id: label.n,v 1.3 2000/05/25 16:57:23 ericm Exp $
+'\" RCS: @(#) $Id: label.n,v 1.4 2000/07/28 16:41:40 ericm Exp $
'\"
.so man.macros
.TH label n 4.0 Tk "Tk Built-In Commands"
@@ -18,12 +18,12 @@ label \- Create and manipulate label widgets
.SO
\-activebackground \-activeforeground \-anchor
\-background \-bitmap \-borderwidth
-\-cursor \-font \-foreground
-\-highlightbackground \-highlightcolor \-highlightthickness
-\-image \-justify \-padx
-\-pady \-relief \-takefocus
-\-text \-textvariable \-underline
-\-wraplength
+\-cursor \-disabledforeground \-font
+\-foreground \-highlightbackground \-highlightcolor
+\-highlightthickness \-image \-justify
+\-padx \-pady \-relief
+\-takefocus \-text \-textvariable
+\-underline \-wraplength
.SE
.SH "WIDGET-SPECIFIC OPTIONS"
.OP \-height height Height
diff --git a/generic/tkListbox.c b/generic/tkListbox.c
index e37ccb8..d931ad7 100644
--- a/generic/tkListbox.c
+++ b/generic/tkListbox.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkListbox.c,v 1.17 2000/07/28 16:34:54 ericm Exp $
+ * RCS: @(#) $Id: tkListbox.c,v 1.18 2000/07/28 16:41:40 ericm Exp $
*/
#include "tkPort.h"
@@ -229,9 +229,8 @@ static Tk_OptionSpec optionSpecs[] = {
DEF_LISTBOX_CURSOR, -1, Tk_Offset(Listbox, cursor),
TK_OPTION_NULL_OK, 0, 0},
{TK_OPTION_COLOR, "-disabledforeground", "disabledForeground",
- "Foreground",
- DEF_LISTBOX_DISABLED_FG, -1, Tk_Offset(Listbox, dfgColorPtr),
- TK_OPTION_NULL_OK, 0, 0},
+ "DisabledForeground", DEF_LISTBOX_DISABLED_FG, -1,
+ Tk_Offset(Listbox, dfgColorPtr), TK_OPTION_NULL_OK, 0, 0},
{TK_OPTION_BOOLEAN, "-exportselection", "exportSelection",
"ExportSelection", DEF_LISTBOX_EXPORT_SELECTION, -1,
Tk_Offset(Listbox, exportSelection), 0, 0, 0},