diff options
| author | forsyth <forsyth@vitanuova.com> | 2010-03-25 10:14:25 +0000 |
|---|---|---|
| committer | forsyth <forsyth@vitanuova.com> | 2010-03-25 10:14:25 +0000 |
| commit | 86018cd3bf2dd3c07c176ced4450ebf78f81d6e1 (patch) | |
| tree | 9612d0860ba7ac505a6f46ad70d1db4f915273e7 | |
| parent | 0b97835064f7a6adffa5529a9676920f6c1ad3bf (diff) | |
20100325-1014
| -rw-r--r-- | include/tk.h | 2 | ||||
| -rw-r--r-- | libtk/buton.c | 4 | ||||
| -rw-r--r-- | libtk/label.c | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/include/tk.h b/include/tk.h index fd6793ee..9f971994 100644 --- a/include/tk.h +++ b/include/tk.h @@ -742,7 +742,7 @@ extern void tkbox(Image*, Rectangle, int, Image*); extern void tkbevel(Image*, Point, int, int, int, Image*, Image*); extern void tkdrawrelief(Image*, Tk*, Point, int, int); extern Point tkstringsize(Tk*, char*); -extern char* tkdrawstring(Tk*, Image*, Point, char*, int, Image *, int); +extern void tkdrawstring(Tk*, Image*, Point, char*, int, Image *, int); extern int tkeventfmt(Fmt*); extern Tk* tkdeliver(Tk*, int, void*); extern int tksubdeliver(Tk*, TkAction*, int, void*, int); diff --git a/libtk/buton.c b/libtk/buton.c index 5cbd1d6e..80a33bab 100644 --- a/libtk/buton.c +++ b/libtk/buton.c @@ -362,9 +362,7 @@ tkdrawbutton(Tk *tk, Point orig) ct = tkgc(e, fgnd); p.y += (h - tkl->textheight) / 2; - o = tkdrawstring(tk, i, addpt(u, p), tkl->text, tkl->ul, ct, tkl->justify); - if(o != nil) - return o; + tkdrawstring(tk, i, addpt(u, p), tkl->text, tkl->ul, ct, tkl->justify); } // if(tkhaskeyfocus(tk)) diff --git a/libtk/label.c b/libtk/label.c index fe1ca2ff..9eef1336 100644 --- a/libtk/label.c +++ b/libtk/label.c @@ -321,9 +321,7 @@ tkdrawlabel(Tk *tk, Point orig) ct = tkgc(e, fgnd); p.y += (h - tkl->textheight) / 2; - o = tkdrawstring(tk, i, addpt(u, p), tkl->text, tkl->ul, ct, tkl->justify); - if(o != nil) - return o; + tkdrawstring(tk, i, addpt(u, p), tkl->text, tkl->ul, ct, tkl->justify); } if(tkhaskeyfocus(tk)) |