From b96d0e706d15778c264f8e824343b050ea4a72d6 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 24 Feb 2007 02:30:17 +0000
Subject: Fix up setup tool to display the video driver setting tabulated with
 all the other settings.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 843
---
 setup/display.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/setup/display.c b/setup/display.c
index cb01f363..531473ce 100644
--- a/setup/display.c
+++ b/setup/display.c
@@ -162,6 +162,17 @@ void ConfigDisplay(void)
     
     window = TXT_NewWindow("Display Configuration");
 
+    TXT_AddWidgets(window, 
+                   TXT_NewCheckBox("Fullscreen", &fullscreen),
+                   ar_table = TXT_NewTable(2),
+                   TXT_NewSeparator("Screen mode"),
+                   modes_table = TXT_NewTable(2),
+                   TXT_NewSeparator("Misc."),
+                   TXT_NewCheckBox("Show ENDOOM screen", &show_endoom),
+                   NULL);
+
+    TXT_SetColumnWidths(ar_table, 25, 0);
+
 #ifdef _WIN32
     {
         txt_dropdown_list_t *driver_list;
@@ -173,21 +184,13 @@ void ConfigDisplay(void)
         TXT_SignalConnect(driver_list, "changed", UpdateVideoDriver, NULL);
         SetWin32VideoDriver();
 
-        TXT_AddWidget(window, driver_list);
+        TXT_AddWidgets(ar_table,
+                       TXT_NewLabel("Video driver"),
+                       driver_list,
+                       NULL);
     }
 #endif
 
-    TXT_AddWidgets(window, 
-                   TXT_NewCheckBox("Fullscreen", &fullscreen),
-                   ar_table = TXT_NewTable(2),
-                   TXT_NewSeparator("Screen mode"),
-                   modes_table = TXT_NewTable(2),
-                   TXT_NewSeparator("Misc."),
-                   TXT_NewCheckBox("Show ENDOOM screen", &show_endoom),
-                   NULL);
-
-    TXT_SetColumnWidths(ar_table, 25, 0);
-
     TXT_AddWidgets(ar_table,
                    TXT_NewLabel("Aspect ratio correction"),
                    ar_dropdown = TXT_NewDropdownList(&aspect_ratio_correct,
-- 
cgit v1.2.3