From 340d437b3fd33a72b0894098a3cb88090980d9a8 Mon Sep 17 00:00:00 2001 From: Ole Loots Date: Sat, 21 Dec 2013 01:49:26 +0100 Subject: Minor changes to gemtk - check for NULL window ptr in gemtk_wm_send_msg - use textarea template string for max textarea string length --- atari/gemtk/gemtk.h | 2 +- atari/gemtk/guiwin.c | 2 +- atari/gemtk/objc.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/atari/gemtk/gemtk.h b/atari/gemtk/gemtk.h index ba463a3c3..44baba429 100644 --- a/atari/gemtk/gemtk.h +++ b/atari/gemtk/gemtk.h @@ -272,7 +272,7 @@ void gemtk_wm_clear(GUIWIN *win); /* -------------------------------------------------------------------------- */ /* AES OBJECT TREE TOOLS */ /* -------------------------------------------------------------------------- */ -char gemtk_obj_set_str_safe(OBJECT * tree, short idx, char *txt); +char gemtk_obj_set_str_safe(OBJECT * tree, short idx, const char *txt); char *gemtk_obj_get_text(OBJECT * tree, short idx); GRECT * gemtk_obj_screen_rect(OBJECT * tree, short obj); bool gemtk_obj_is_inside(OBJECT * tree, short obj, GRECT *area); diff --git a/atari/gemtk/guiwin.c b/atari/gemtk/guiwin.c index 18d873c7d..078fb3678 100644 --- a/atari/gemtk/guiwin.c +++ b/atari/gemtk/guiwin.c @@ -1219,7 +1219,7 @@ void gemtk_wm_send_msg(GUIWIN *win, short msg_type, short a, short b, short c, msg[0] = msg_type; msg[1] = gl_apid; msg[2] = 0; - msg[3] = win->handle; + msg[3] = (win != NULL) ? win->handle : NULL; msg[4] = a; msg[5] = b; msg[6] = c; diff --git a/atari/gemtk/objc.c b/atari/gemtk/objc.c index 50d70dd9d..514f6b544 100644 --- a/atari/gemtk/objc.c +++ b/atari/gemtk/objc.c @@ -66,7 +66,7 @@ static void set_text(OBJECT *obj, short idx, char * text, int len) set_string(obj, idx, spare); } -char gemtk_obj_set_str_safe(OBJECT * tree, short idx, char *txt) +char gemtk_obj_set_str_safe(OBJECT * tree, short idx, const char *txt) { char spare[204]; short type = 0; @@ -77,7 +77,7 @@ char gemtk_obj_set_str_safe(OBJECT * tree, short idx, char *txt) type = (tree[idx].ob_type & 0xFF); if (type == G_FTEXT || type == G_FBOXTEXT) { TEDINFO *ted = ((TEDINFO *)get_obspec(tree, idx)); - maxlen = ted->te_txtlen+1; + maxlen = ted->te_tmplen+1; if (maxlen > 200) { maxlen = 200; } else if (maxlen < 0) { -- cgit v1.2.3