Make TXT_AddWidget take a NULL pointer so different widget types can

be passed to it.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 481

1 files changed, 6 insertions, 22 deletions

diff --git a/textscreen/guitest.c b/textscreen/guitest.c
index afa0a45a..b4cd8df5 100644
--- a/textscreen/guitest.c
+++ b/textscreen/guitest.c
@@ -1,5 +1,5 @@
 #include <stdlib.h>
-
+#include <string.h>
 
 #include "txt_main.h"
 
@@ -19,34 +19,21 @@ void SetupWindow(void)
 
     strcpy(buf, "This is a button label: ");
 
-    {
-        txt_separator_t *sep;
-        sep = TXT_NewSeparator("Main Section");
-        TXT_AddWidget(window, &sep->widget);
-    }
+    TXT_AddWidget(window, TXT_NewSeparator("Main Section"));
 
     for (i=0; i<8; ++i)
     {
-        txt_button_t *button;
-
-        button = TXT_NewButton(buf);
         strcat(buf, "a");
-        TXT_AddWidget(window, &button->widget);
+        TXT_AddWidget(window, TXT_NewButton(buf));
 
         if (i == 4)
         {
-            txt_separator_t *sep;
-
-            sep = TXT_NewSeparator("Section");
-            TXT_AddWidget(window, &sep->widget);
+            TXT_AddWidget(window, TXT_NewSeparator("Section"));
         }
 
         if (i == 6)
         {
-            txt_separator_t *sep;
-
-            sep = TXT_NewSeparator(NULL);
-            TXT_AddWidget(window, &sep->widget);
+            TXT_AddWidget(window, TXT_NewSeparator(NULL));
         }
     }
 
@@ -62,10 +49,7 @@ void Window2(void)
 
     for (i=0; i<5; ++i)
     {
-        txt_button_t *button;
-
-        button = TXT_NewButton("hello there blah blah blah blah");
-        TXT_AddWidget(window, &button->widget);
+        TXT_AddWidget(window, TXT_NewButton("hello there blah blah blah blah"));
     }
 }