summaryrefslogtreecommitdiff
path: root/textscreen/txt_label.c
diff options
context:
space:
mode:
authorSimon Howard2010-12-10 20:31:46 +0000
committerSimon Howard2010-12-10 20:31:46 +0000
commit56824b130b786aab49876a71c6c768a17c5a4f1c (patch)
treef05611777e7b7014d0764fc957ea3b2c2543a054 /textscreen/txt_label.c
parent9caebe584ccb95239b2ed360d4bce3dffc5ecfea (diff)
downloadchocolate-doom-56824b130b786aab49876a71c6c768a17c5a4f1c.tar.gz
chocolate-doom-56824b130b786aab49876a71c6c768a17c5a4f1c.tar.bz2
chocolate-doom-56824b130b786aab49876a71c6c768a17c5a4f1c.zip
Replace txt_widget_t#selectable with a callback function to query
whether the widget is selectable. This stops the table code from selecting things that aren't really selectable - eg. empty tables, scrollpanes containing unselectable widgets, etc. Fixes a bug with the warp menu (thanks Proteh). Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2207
Diffstat (limited to 'textscreen/txt_label.c')
-rw-r--r--textscreen/txt_label.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/textscreen/txt_label.c b/textscreen/txt_label.c
index 7ae29c3d..0deea803 100644
--- a/textscreen/txt_label.c
+++ b/textscreen/txt_label.c
@@ -104,6 +104,7 @@ static void TXT_LabelDestructor(TXT_UNCAST_ARG(label))
txt_widget_class_t txt_label_class =
{
+ TXT_NeverSelectable,
TXT_LabelSizeCalc,
TXT_LabelDrawer,
NULL,
@@ -170,7 +171,6 @@ txt_label_t *TXT_NewLabel(char *text)
label = malloc(sizeof(txt_label_t));
TXT_InitWidget(label, &txt_label_class);
- label->widget.selectable = 0;
label->label = NULL;
label->lines = NULL;