diff options
| -rw-r--r-- | generic/tkCanvLine.c | 2 | ||||
| -rw-r--r-- | generic/tkCanvText.c | 2 | ||||
| -rw-r--r-- | library/demos/items.tcl | 6 | ||||
| -rw-r--r-- | macosx/tkMacOSXDefault.h | 2 | ||||
| -rw-r--r-- | unix/tkUnixDefault.h | 2 | ||||
| -rw-r--r-- | win/tkWinDefault.h | 2 |
6 files changed, 7 insertions, 9 deletions
diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c index c9444f3..06ba3b1 100644 --- a/generic/tkCanvLine.c +++ b/generic/tkCanvLine.c @@ -176,7 +176,7 @@ static const Tk_ConfigSpec configSpecs[] = { {TK_CONFIG_CAP_STYLE, "-capstyle", NULL, NULL, "butt", Tk_Offset(LineItem, capStyle), TK_CONFIG_DONT_SET_DEFAULT, NULL}, {TK_CONFIG_COLOR, "-fill", NULL, NULL, - DEF_CANVLINE_FILL, Tk_Offset(LineItem, outline.color), TK_CONFIG_NULL_OK, NULL}, + NULL, Tk_Offset(LineItem, outline.color), TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_CUSTOM, "-dash", NULL, NULL, NULL, Tk_Offset(LineItem, outline.dash), TK_CONFIG_NULL_OK, &dashOption}, diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c index 648647c..92c520c 100644 --- a/generic/tkCanvText.c +++ b/generic/tkCanvText.c @@ -107,7 +107,7 @@ static const Tk_ConfigSpec configSpecs[] = { {TK_CONFIG_BITMAP, "-disabledstipple", NULL, NULL, NULL, Tk_Offset(TextItem, disabledStipple), TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_COLOR, "-fill", NULL, NULL, - DEF_CANVTEXT_FILL, Tk_Offset(TextItem, color), TK_CONFIG_NULL_OK, NULL}, + NULL, Tk_Offset(TextItem, color), TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_FONT, "-font", NULL, NULL, DEF_CANVTEXT_FONT, Tk_Offset(TextItem, tkfont), 0, NULL}, {TK_CONFIG_JUSTIFY, "-justify", NULL, NULL, diff --git a/library/demos/items.tcl b/library/demos/items.tcl index 7f28f2f..bf54a89 100644 --- a/library/demos/items.tcl +++ b/library/demos/items.tcl @@ -126,8 +126,10 @@ $c create text 25.5c 11c -anchor w -font $font1 -fill $blue \ -text "Several lines,\n each centered\nindividually,\nand all anchored\nat the left edge." \ -justify center -tags item $c create rectangle 24.9c 13.9c 25.1c 14.1c +catch { $c create text 25c 14c -font $font2 -anchor c -fill $red -angle 15 \ -text "Angled characters" -tags item +} $c create text 5c 16.2c -text Arcs -anchor n $c create arc 0.5c 17c 7c 20c -fill $green -outline black \ @@ -140,13 +142,15 @@ $c create arc 0.5c 20c 9.5c 24c -width 4m -style pieslice \ $c create arc 5.5c 20.5c 9.5c 23.5c -width 4m -style chord \ -fill $blue -outline {} -start 45 -extent 270 -tags item +$c create text 15c 16.2c -text "Bitmaps and Images" -anchor n +catch { image create photo items.ousterhout \ -file [file join $tk_demoDirectory images ouster.png] image create photo items.ousterhout.active -format "png -alpha 0.5" \ -file [file join $tk_demoDirectory images ouster.png] -$c create text 15c 16.2c -text "Bitmaps and Images" -anchor n $c create image 13c 20c -tags item -image items.ousterhout \ -activeimage items.ousterhout.active +} $c create bitmap 17c 18.5c -tags item \ -bitmap @[file join $tk_demoDirectory images noletter.xbm] $c create bitmap 17c 21.5c -tags item \ diff --git a/macosx/tkMacOSXDefault.h b/macosx/tkMacOSXDefault.h index 6463ea2..4e73ac9 100644 --- a/macosx/tkMacOSXDefault.h +++ b/macosx/tkMacOSXDefault.h @@ -549,7 +549,6 @@ * Defaults for canvas text: */ -#define DEF_CANVTEXT_FILL NORMAL_FG #define DEF_CANVTEXT_FONT "TkDefaultFont" /* @@ -559,7 +558,6 @@ #define DEF_CANVBMAP_FG NORMAL_FG #define DEF_CANVITEM_OUTLINE NORMAL_FG -#define DEF_CANVLINE_FILL DEF_CANVITEM_OUTLINE /* * Defaults for toplevels (most of the defaults for frames also apply diff --git a/unix/tkUnixDefault.h b/unix/tkUnixDefault.h index f2c119b..3e9ef97 100644 --- a/unix/tkUnixDefault.h +++ b/unix/tkUnixDefault.h @@ -511,7 +511,6 @@ * Defaults for canvas text: */ -#define DEF_CANVTEXT_FILL BLACK #define DEF_CANVTEXT_FONT "TkDefaultFont" /* @@ -521,7 +520,6 @@ #define DEF_CANVBMAP_FG BLACK #define DEF_CANVITEM_OUTLINE BLACK -#define DEF_CANVLINE_FILL DEF_CANVITEM_OUTLINE /* * Defaults for toplevels (most of the defaults for frames also apply diff --git a/win/tkWinDefault.h b/win/tkWinDefault.h index be41bb6..852de02 100644 --- a/win/tkWinDefault.h +++ b/win/tkWinDefault.h @@ -515,7 +515,6 @@ * Defaults for canvas text: */ -#define DEF_CANVTEXT_FILL NORMAL_FG #define DEF_CANVTEXT_FONT "TkDefaultFont" /* @@ -525,7 +524,6 @@ #define DEF_CANVBMAP_FG NORMAL_FG #define DEF_CANVITEM_OUTLINE NORMAL_FG -#define DEF_CANVLINE_FILL DEF_CANVITEM_OUTLINE /* * Defaults for toplevels (most of the defaults for frames also apply |