commit 22b086318556567419e1aea8994a9fc62b9c3ac5
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Mon May 29 20:00:41 2006 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Mon May 29 20:00:41 2006 +0000
Add textscreen.h top level header to avoid having to include all txt_*
headers individually.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 542
---
src/net_gui.c | 12 ++---------
textscreen/Makefile.am | 1 +
textscreen/examples/calculator.c | 6 ++----
textscreen/examples/guitest.c | 15 +-------------
textscreen/textscreen.h | 45 ++++++++++++++++++++++++++++++++++++++++
5 files changed, 51 insertions(+), 28 deletions(-)
diff --git a/src/net_gui.c b/src/net_gui.c
index fa64b9d8..e71a1f43 100644
--- a/src/net_gui.c
+++ b/src/net_gui.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: net_gui.c 541 2006-05-29 19:54:11Z fraggle $
+// $Id: net_gui.c 542 2006-05-29 20:00:41Z fraggle $
//
// Copyright(C) 2005 Simon Howard
//
@@ -88,15 +88,7 @@
#include "net_gui.h"
#include "net_server.h"
-#include "txt_main.h"
-#include "txt_gui.h"
-#include "txt_io.h"
-
-#include "txt_desktop.h"
-#include "txt_label.h"
-#include "txt_strut.h"
-#include "txt_table.h"
-#include "txt_window.h"
+#include "textscreen.h"
static txt_window_t *window;
static txt_label_t *player_labels[MAXPLAYERS];
diff --git a/textscreen/Makefile.am b/textscreen/Makefile.am
index 15eb526c..899088fb 100644
--- a/textscreen/Makefile.am
+++ b/textscreen/Makefile.am
@@ -8,6 +8,7 @@ SUBDIRS= . examples
noinst_LIBRARIES=libtextscreen.a
libtextscreen_a_SOURCES = \
+ textscreen.h \
txt_checkbox.c txt_checkbox.h \
txt_desktop.c txt_desktop.h \
txt_gui.c txt_gui.h \
diff --git a/textscreen/examples/calculator.c b/textscreen/examples/calculator.c
index 18f63aa1..c2be94f8 100644
--- a/textscreen/examples/calculator.c
+++ b/textscreen/examples/calculator.c
@@ -1,10 +1,8 @@
#include <stdio.h>
#include <string.h>
-#include "txt_button.h"
-#include "txt_desktop.h"
-#include "txt_label.h"
-#include "txt_separator.h"
+
+#include "textscreen.h"
typedef enum
{
diff --git a/textscreen/examples/guitest.c b/textscreen/examples/guitest.c
index 73334b47..b278d80f 100644
--- a/textscreen/examples/guitest.c
+++ b/textscreen/examples/guitest.c
@@ -2,20 +2,7 @@
#include <stdlib.h>
#include <string.h>
-#include "doomkeys.h"
-
-#include "txt_main.h"
-
-#include "txt_checkbox.h"
-#include "txt_button.h"
-#include "txt_desktop.h"
-#include "txt_inputbox.h"
-#include "txt_label.h"
-#include "txt_radiobutton.h"
-#include "txt_separator.h"
-#include "txt_strut.h"
-#include "txt_table.h"
-#include "txt_window.h"
+#include "textscreen.h"
enum
{
diff --git a/textscreen/textscreen.h b/textscreen/textscreen.h
new file mode 100644
index 00000000..06fb6c37
--- /dev/null
+++ b/textscreen/textscreen.h
@@ -0,0 +1,45 @@
+// Emacs style mode select -*- C++ -*-
+//-----------------------------------------------------------------------------
+//
+// $Id$
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2006 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+
+#ifndef TEXTSCREEN_H
+#define TEXTSCREEN_H
+
+#include "../src/doomkeys.h"
+#include "txt_main.h"
+
+#include "txt_button.h"
+#include "txt_checkbox.h"
+#include "txt_desktop.h"
+#include "txt_inputbox.h"
+#include "txt_label.h"
+#include "txt_radiobutton.h"
+#include "txt_separator.h"
+#include "txt_strut.h"
+#include "txt_table.h"
+#include "txt_widget.h"
+#include "txt_window_action.h"
+#include "txt_window.h"
+
+#endif /* #ifndef TEXTSCREEN_H */
+