From 6339c4cbeb608b008eafe0b1e358285ae08ef902 Mon Sep 17 00:00:00 2001
From: Russell Rice
Date: Thu, 21 Sep 2006 11:13:28 +0000
Subject: Fix a lot of warnings (for fussy compilers) and one always-true check

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 641
---
 textscreen/txt_button.c        |  1 +
 textscreen/txt_checkbox.c      |  1 +
 textscreen/txt_dropdown.c      |  1 +
 textscreen/txt_inputbox.c      |  2 ++
 textscreen/txt_io.c            |  2 +-
 textscreen/txt_label.c         |  1 +
 textscreen/txt_main.c          | 32 ++++++++++++++++----------------
 textscreen/txt_radiobutton.c   |  1 +
 textscreen/txt_separator.c     |  1 +
 textscreen/txt_spinctrl.c      |  1 +
 textscreen/txt_strut.c         |  1 +
 textscreen/txt_window_action.c |  1 +
 12 files changed, 28 insertions(+), 17 deletions(-)

(limited to 'textscreen')

diff --git a/textscreen/txt_button.c b/textscreen/txt_button.c
index 9e5b6d0d..e8420558 100644
--- a/textscreen/txt_button.c
+++ b/textscreen/txt_button.c
@@ -101,6 +101,7 @@ txt_widget_class_t txt_button_class =
     TXT_ButtonKeyPress,
     TXT_ButtonDestructor,
     TXT_ButtonMousePress,
+    0,
 };
 
 void TXT_SetButtonLabel(txt_button_t *button, char *label)
diff --git a/textscreen/txt_checkbox.c b/textscreen/txt_checkbox.c
index bb26211f..37fb0747 100644
--- a/textscreen/txt_checkbox.c
+++ b/textscreen/txt_checkbox.c
@@ -122,6 +122,7 @@ txt_widget_class_t txt_checkbox_class =
     TXT_CheckBoxKeyPress,
     TXT_CheckBoxDestructor,
     TXT_CheckBoxMousePress,
+    0,
 };
 
 txt_checkbox_t *TXT_NewCheckBox(char *label, int *variable)
diff --git a/textscreen/txt_dropdown.c b/textscreen/txt_dropdown.c
index 0dbdec4d..504d4156 100644
--- a/textscreen/txt_dropdown.c
+++ b/textscreen/txt_dropdown.c
@@ -265,6 +265,7 @@ txt_widget_class_t txt_dropdown_list_class =
     TXT_DropdownListKeyPress,
     TXT_DropdownListDestructor,
     TXT_DropdownListMousePress,
+    0,
 };
 
 txt_dropdown_list_t *TXT_NewDropdownList(int *variable, char **values, 
diff --git a/textscreen/txt_inputbox.c b/textscreen/txt_inputbox.c
index c3f4f255..4ef1300c 100644
--- a/textscreen/txt_inputbox.c
+++ b/textscreen/txt_inputbox.c
@@ -235,6 +235,7 @@ txt_widget_class_t txt_inputbox_class =
     TXT_InputBoxKeyPress,
     TXT_InputBoxDestructor,
     TXT_InputBoxMousePress,
+    0,
 };
 
 txt_widget_class_t txt_int_inputbox_class =
@@ -244,6 +245,7 @@ txt_widget_class_t txt_int_inputbox_class =
     TXT_IntInputBoxKeyPress,
     TXT_InputBoxDestructor,
     TXT_InputBoxMousePress,
+    0,
 };
 
 static void SetBufferFromValue(txt_inputbox_t *inputbox)
diff --git a/textscreen/txt_io.c b/textscreen/txt_io.c
index 96a6e911..1e8106e7 100644
--- a/textscreen/txt_io.c
+++ b/textscreen/txt_io.c
@@ -59,7 +59,7 @@ static txt_color_t bgcolor = TXT_COLOR_BLACK;
 
 static int GetColorForName(char *s)
 {
-    int i;
+    size_t i;
 
     for (i=0; i<sizeof(colors) / sizeof(*colors); ++i)
     {
diff --git a/textscreen/txt_label.c b/textscreen/txt_label.c
index 86250372..19a9646e 100644
--- a/textscreen/txt_label.c
+++ b/textscreen/txt_label.c
@@ -108,6 +108,7 @@ txt_widget_class_t txt_label_class =
     TXT_LabelDrawer,
     NULL,
     TXT_LabelDestructor,
+    0,
 };
 
 void TXT_SetLabel(txt_label_t *label, char *value)
diff --git a/textscreen/txt_main.c b/textscreen/txt_main.c
index 72760449..a4a7f7e3 100644
--- a/textscreen/txt_main.c
+++ b/textscreen/txt_main.c
@@ -47,22 +47,22 @@ static unsigned char *screendata;
 
 static SDL_Color ega_colors[] = 
 {
-    {0x00, 0x00, 0x00},          // 0: Black
-    {0x00, 0x00, 0xa8},          // 1: Blue
-    {0x00, 0xa8, 0x00},          // 2: Green
-    {0x00, 0xa8, 0xa8},          // 3: Cyan
-    {0xa8, 0x00, 0x00},          // 4: Red
-    {0xa8, 0x00, 0xa8},          // 5: Magenta
-    {0xa8, 0x54, 0x00},          // 6: Brown
-    {0xa8, 0xa8, 0xa8},          // 7: Grey
-    {0x54, 0x54, 0x54},          // 8: Dark grey
-    {0x54, 0x54, 0xfe},          // 9: Bright blue
-    {0x54, 0xfe, 0x54},          // 10: Bright green
-    {0x54, 0xfe, 0xfe},          // 11: Bright cyan
-    {0xfe, 0x54, 0x54},          // 12: Bright red
-    {0xfe, 0x54, 0xfe},          // 13: Bright magenta
-    {0xfe, 0xfe, 0x54},          // 14: Yellow
-    {0xfe, 0xfe, 0xfe},          // 15: Bright white
+    {0x00, 0x00, 0x00, 0x00},          // 0: Black
+    {0x00, 0x00, 0xa8, 0x00},          // 1: Blue
+    {0x00, 0xa8, 0x00, 0x00},          // 2: Green
+    {0x00, 0xa8, 0xa8, 0x00},          // 3: Cyan
+    {0xa8, 0x00, 0x00, 0x00},          // 4: Red
+    {0xa8, 0x00, 0xa8, 0x00},          // 5: Magenta
+    {0xa8, 0x54, 0x00, 0x00},          // 6: Brown
+    {0xa8, 0xa8, 0xa8, 0x00},          // 7: Grey
+    {0x54, 0x54, 0x54, 0x00},          // 8: Dark grey
+    {0x54, 0x54, 0xfe, 0x00},          // 9: Bright blue
+    {0x54, 0xfe, 0x54, 0x00},          // 10: Bright green
+    {0x54, 0xfe, 0xfe, 0x00},          // 11: Bright cyan
+    {0xfe, 0x54, 0x54, 0x00},          // 12: Bright red
+    {0xfe, 0x54, 0xfe, 0x00},          // 13: Bright magenta
+    {0xfe, 0xfe, 0x54, 0x00},          // 14: Yellow
+    {0xfe, 0xfe, 0xfe, 0x00},          // 15: Bright white
 };
 
 //
diff --git a/textscreen/txt_radiobutton.c b/textscreen/txt_radiobutton.c
index 411772f0..374220b3 100644
--- a/textscreen/txt_radiobutton.c
+++ b/textscreen/txt_radiobutton.c
@@ -126,6 +126,7 @@ txt_widget_class_t txt_radiobutton_class =
     TXT_RadioButtonKeyPress,
     TXT_RadioButtonDestructor,
     TXT_RadioButtonMousePress,
+    0,
 };
 
 txt_radiobutton_t *TXT_NewRadioButton(char *label, int *variable, int value)
diff --git a/textscreen/txt_separator.c b/textscreen/txt_separator.c
index 690873a7..97d4c255 100644
--- a/textscreen/txt_separator.c
+++ b/textscreen/txt_separator.c
@@ -86,6 +86,7 @@ txt_widget_class_t txt_separator_class =
     TXT_SeparatorDrawer,
     NULL,
     TXT_SeparatorDestructor,
+    0,
 };
 
 txt_separator_t *TXT_NewSeparator(char *label)
diff --git a/textscreen/txt_spinctrl.c b/textscreen/txt_spinctrl.c
index 44c59815..53ac589d 100644
--- a/textscreen/txt_spinctrl.c
+++ b/textscreen/txt_spinctrl.c
@@ -164,6 +164,7 @@ txt_widget_class_t txt_spincontrol_class =
     TXT_SpinControlKeyPress,
     TXT_SpinControlDestructor,
     TXT_SpinControlMousePress,
+    0,
 };
 
 txt_spincontrol_t *TXT_NewSpinControl(int *value, int min, int max)
diff --git a/textscreen/txt_strut.c b/textscreen/txt_strut.c
index a3fb9084..f2daaa9b 100644
--- a/textscreen/txt_strut.c
+++ b/textscreen/txt_strut.c
@@ -59,6 +59,7 @@ txt_widget_class_t txt_strut_class =
     TXT_StrutDrawer,
     TXT_StrutKeyPress,
     TXT_StrutDestructor,
+    0,
 };
 
 txt_strut_t *TXT_NewStrut(int width, int height)
diff --git a/textscreen/txt_window_action.c b/textscreen/txt_window_action.c
index 473f792d..91ecdcde 100644
--- a/textscreen/txt_window_action.c
+++ b/textscreen/txt_window_action.c
@@ -98,6 +98,7 @@ txt_widget_class_t txt_window_action_class =
     TXT_WindowActionKeyPress,
     TXT_WindowActionDestructor,
     TXT_WindowActionMousePress,
+    0,
 };
 
 txt_window_action_t *TXT_NewWindowAction(int key, char *label)
-- 
cgit v1.2.3