From 198de5397ed4a217273bda29dae8ddf60ba48f1d Mon Sep 17 00:00:00 2001 From: frosch Date: Fri, 1 Jun 2012 10:44:45 +0000 Subject: [PATCH] (svn r24309) -Codechange: Split some functions from gui.h to settings_gui.h --- projects/openttd_vs100.vcxproj | 1 + projects/openttd_vs100.vcxproj.filters | 3 +++ projects/openttd_vs80.vcproj | 4 ++++ projects/openttd_vs90.vcproj | 4 ++++ source.list | 1 + src/ai/ai_gui.cpp | 2 +- src/cheat_gui.cpp | 2 +- src/gui.h | 3 --- src/industry_gui.cpp | 1 + src/newgrf_gui.cpp | 2 +- src/settings_gui.cpp | 2 +- src/settings_gui.h | 21 +++++++++++++++++++++ 12 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 src/settings_gui.h diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj index be3eb0a0d3..7665aaa989 100644 --- a/projects/openttd_vs100.vcxproj +++ b/projects/openttd_vs100.vcxproj @@ -539,6 +539,7 @@ + diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters index 7fc87d093f..c7dc8819ab 100644 --- a/projects/openttd_vs100.vcxproj.filters +++ b/projects/openttd_vs100.vcxproj.filters @@ -846,6 +846,9 @@ Header Files + + Header Files + Header Files diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj index fb895a43f5..57aed0f1ce 100644 --- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -1430,6 +1430,10 @@ RelativePath=".\..\src\settings_func.h" > + + diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj index 37dc590031..bad657eb53 100644 --- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -1427,6 +1427,10 @@ RelativePath=".\..\src\settings_func.h" > + + diff --git a/source.list b/source.list index 774df5d8a8..aeacabea5e 100644 --- a/source.list +++ b/source.list @@ -272,6 +272,7 @@ sdl.h sound/sdl_s.h video/sdl_v.h settings_func.h +settings_gui.h settings_internal.h settings_type.h ship.h diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp index b7d3850308..82ceb1641f 100644 --- 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" diff --git a/src/cheat_gui.cpp b/src/cheat_gui.cpp index be4f573992..33d9ae20ec 100644 --- 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" diff --git a/src/gui.h b/src/gui.h index e7cc5d5fd1..43fa310b30 100644 --- 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 InitializeGUI(); 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); diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index ddf4f3c4a8..8b182dbd93 100644 --- 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" diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp index 95f4565aa1..447345ef01 100644 --- 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" diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 0dd5a439b1..d066284a83 100644 --- 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" diff --git a/src/settings_gui.h b/src/settings_gui.h new file mode 100644 index 0000000000..18af89f6ad --- /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 . + */ + +/** @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 */ +