summaryrefslogtreecommitdiffstats
path: root/generic/tkCanvText.c
diff options
context:
space:
mode:
authornijtmans <nijtmans>2008-10-30 23:18:59 (GMT)
committernijtmans <nijtmans>2008-10-30 23:18:59 (GMT)
commit6f5d76a8755403d49a1465f4b9f41164a7f311f2 (patch)
tree9f94fbbc8e20c71db340e9aa5b02b47387bd82f0 /generic/tkCanvText.c
parent4dddde633cc58640988340836315bbb6b780b9da (diff)
downloadtk-6f5d76a8755403d49a1465f4b9f41164a7f311f2.zip
tk-6f5d76a8755403d49a1465f4b9f41164a7f311f2.tar.gz
tk-6f5d76a8755403d49a1465f4b9f41164a7f311f2.tar.bz2
more internal -Wwrite-strings warning fixes
Diffstat (limited to 'generic/tkCanvText.c')
-rw-r--r--generic/tkCanvText.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c
index 21987f7..50fbebd 100644
--- a/generic/tkCanvText.c
+++ b/generic/tkCanvText.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkCanvText.c,v 1.29 2008/10/03 15:37:13 dkf Exp $
+ * RCS: @(#) $Id: tkCanvText.c,v 1.30 2008/10/30 23:18:59 nijtmans Exp $
*/
#include <stdio.h>
@@ -85,16 +85,13 @@ typedef struct TextItem {
*/
static Tk_CustomOption stateOption = {
- (Tk_OptionParseProc *) TkStateParseProc,
- TkStatePrintProc, (ClientData) 2
+ TkStateParseProc, TkStatePrintProc, (ClientData) 2
};
static Tk_CustomOption tagsOption = {
- (Tk_OptionParseProc *) Tk_CanvasTagsParseProc,
- Tk_CanvasTagsPrintProc, (ClientData) NULL
+ Tk_CanvasTagsParseProc, Tk_CanvasTagsPrintProc, (ClientData) NULL
};
static Tk_CustomOption offsetOption = {
- (Tk_OptionParseProc *) TkOffsetParseProc,
- TkOffsetPrintProc, (ClientData) (TK_OFFSET_RELATIVE)
+ TkOffsetParseProc, TkOffsetPrintProc, (ClientData) (TK_OFFSET_RELATIVE)
};
static Tk_ConfigSpec configSpecs[] = {
@@ -1431,7 +1428,7 @@ TextToPostscript(
TextItem *textPtr = (TextItem *) itemPtr;
int x, y;
Tk_FontMetrics fm;
- char *justify;
+ const char *justify;
char buffer[500];
XColor *color;
Pixmap stipple;