Mercurial > hg > openttd

changeset 19406:0731e1a0613a draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r24309) -Codechange: Split some functions from gui.h to settings_gui.h
author frosch <frosch@openttd.org>
date Fri, 01 Jun 2012 10:44:45 +0000
parents c51f261bae79
children e4f32df0a2b7
files projects/openttd_vs100.vcxproj projects/openttd_vs100.vcxproj.filters projects/openttd_vs80.vcproj projects/openttd_vs90.vcproj source.list src/ai/ai_gui.cpp src/cheat_gui.cpp src/gui.h src/industry_gui.cpp src/newgrf_gui.cpp src/settings_gui.cpp src/settings_gui.h
diffstat 12 files changed, 39 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -539,6 +539,7 @@
     <ClInclude Include="..\src\sound\sdl_s.h" />
     <ClInclude Include="..\src\video\sdl_v.h" />
     <ClInclude Include="..\src\settings_func.h" />
+    <ClInclude Include="..\src\settings_gui.h" />
     <ClInclude Include="..\src\settings_internal.h" />
     <ClInclude Include="..\src\settings_type.h" />
     <ClInclude Include="..\src\ship.h" />
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -846,6 +846,9 @@
     <ClInclude Include="..\src\settings_func.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\settings_gui.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\settings_internal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -1431,6 +1431,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\settings_gui.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\settings_internal.h"
 				>
 			</File>
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -1428,6 +1428,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\settings_gui.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\settings_internal.h"
 				>
 			</File>
--- a/source.list
+++ b/source.list
@@ -272,6 +272,7 @@
 sound/sdl_s.h
 video/sdl_v.h
 settings_func.h
+settings_gui.h
 settings_internal.h
 settings_type.h
 ship.h
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -12,7 +12,7 @@
 #include "../stdafx.h"
 #include "../table/sprites.h"
 #include "../error.h"
-#include "../gui.h"
+#include "../settings_gui.h"
 #include "../querystring_gui.h"
 #include "../company_base.h"
 #include "../company_gui.h"
--- a/src/cheat_gui.cpp
+++ b/src/cheat_gui.cpp
@@ -22,7 +22,7 @@
 #include "strings_func.h"
 #include "window_func.h"
 #include "rail_gui.h"
-#include "gui.h"
+#include "settings_gui.h"
 #include "company_gui.h"
 
 #include "widgets/cheat_widget.h"
--- a/src/gui.h
+++ b/src/gui.h
@@ -13,7 +13,6 @@
 #define GUI_H
 
 #include "vehicle_type.h"
-#include "gfx_type.h"
 #include "economy_type.h"
 #include "tile_type.h"
 #include "transport_type.h"
@@ -28,8 +27,6 @@
 void ShowGameOptions();
 void ShowGameDifficulty();
 void ShowGameSettings();
-void DrawArrowButtons(int x, int y, Colours button_colour, byte state, bool clickable_left, bool clickable_right);
-void DrawBoolButton(int x, int y, bool state, bool clickable);
 
 /* train_gui.cpp */
 void ShowOrdersWindow(const Vehicle *v);
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -12,6 +12,7 @@
 #include "stdafx.h"
 #include "error.h"
 #include "gui.h"
+#include "settings_gui.h"
 #include "sound_func.h"
 #include "window_func.h"
 #include "textbuf_gui.h"
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -11,7 +11,7 @@
 
 #include "stdafx.h"
 #include "error.h"
-#include "gui.h"
+#include "settings_gui.h"
 #include "newgrf.h"
 #include "strings_func.h"
 #include "window_func.h"
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -12,7 +12,7 @@
 #include "stdafx.h"
 #include "currency.h"
 #include "error.h"
-#include "gui.h"
+#include "settings_gui.h"
 #include "textbuf_gui.h"
 #include "command_func.h"
 #include "screenshot.h"
new file mode 100644
--- /dev/null
+++ b/src/settings_gui.h
@@ -0,0 +1,21 @@
+/* $Id$ */
+
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD 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, version 2.
+ * OpenTTD 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 OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file settings_gui.h Functions for setting GUIs. */
+
+#ifndef SETTING_GUI_H
+#define SETTING_GUI_H
+
+#include "gfx_type.h"
+
+void DrawArrowButtons(int x, int y, Colours button_colour, byte state, bool clickable_left, bool clickable_right);
+void DrawBoolButton(int x, int y, bool state, bool clickable);
+
+#endif /* SETTING_GUI_H */
+