(svn r11667) -Codechange: split window.h into a header that defines some 'global' window related types, on that defined 'global' window functions and one that defines functions and types only used by *_gui.cpps.

src/aircraft_gui.cpp

@@ -11,7 +11,6 @@
 #include "table/strings.h"
 #include "strings.h"
 #include "map.h"
-#include "window.h"
 #include "gui.h"
 #include "vehicle.h"
 #include "gfx.h"

src/airport_gui.cpp

@@ -8,7 +8,6 @@
 #include "table/strings.h"
 #include "functions.h"
 #include "map.h"
-#include "window.h"
 #include "gui.h"
 #include "viewport.h"
 #include "gfx.h"

src/autoreplace_gui.cpp

@@ -9,7 +9,6 @@
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "strings.h"
-#include "window.h"
 #include "gui.h"
 #include "command.h"
 #include "variables.h"

src/bridge_gui.cpp

@@ -8,7 +8,6 @@
 #include "strings.h"
 #include "functions.h"
 #include "map.h"
-#include "window.h"
 #include "gui.h"
 #include "viewport.h"
 #include "gfx.h"

src/build_vehicle_gui.cpp

@@ -12,7 +12,6 @@
 #include "functions.h"
 #include "table/sprites.h"
 #include "table/strings.h"
-#include "window.h"
 #include "gui.h"
 #include "vehicle.h"
 #include "articulated_vehicles.h"

src/console.cpp

@@ -6,7 +6,6 @@
 #include "openttd.h"
 #include "table/strings.h"
 #include "functions.h"
-#include "window.h"
 #include "gui.h"
 #include "gfx.h"
 #include "player.h"

src/console.h

@@ -5,6 +5,8 @@
 #ifndef CONSOLE_H
 #define CONSOLE_H
 
+#include "window_type.h"
+
 /* maximum length of a typed in command */
 #define ICON_CMDLN_SIZE 255
 /* maximum length of a totally expanded command */

src/dock_gui.cpp

@@ -8,7 +8,6 @@
 #include "table/strings.h"
 #include "functions.h"
 #include "map.h"
-#include "window.h"
 #include "station.h"
 #include "gui.h"
 #include "viewport.h"

src/economy.cpp

@@ -15,7 +15,6 @@
 #include "player.h"
 #include "station.h"
 #include "vehicle.h"
-#include "window.h"
 #include "gfx.h"
 #include "command.h"
 #include "saveload.h"

src/engine_gui.cpp

@@ -8,7 +8,6 @@
 #include "strings.h"
 #include "table/sprites.h"
 #include "functions.h"
-#include "window.h"
 #include "gui.h"
 #include "viewport.h"
 #include "gfx.h"

src/genworld_gui.cpp

@@ -8,7 +8,6 @@
 #include "functions.h"
 #include "table/strings.h"
 #include "table/sprites.h"
-#include "window.h"
 #include "gui.h"
 #include "gfx.h"
 #include "strings.h"

src/graph_gui.cpp

@@ -8,7 +8,6 @@
 #include "strings.h"
 #include "table/sprites.h"
 #include "functions.h"
-#include "window.h"
 #include "gui.h"
 #include "gfx.h"
 #include "player.h"

src/group_cmd.cpp

@@ -16,7 +16,6 @@
 #include "train.h"
 #include "aircraft.h"
 #include "string.h"
-#include "window.h"
 #include "vehicle_gui.h"
 #include "strings.h"
 #include "misc/autoptr.hpp"

src/group_gui.cpp

@@ -7,7 +7,6 @@
 #include "functions.h"
 #include "table/strings.h"
 #include "table/sprites.h"
-#include "window.h"
 #include "gui.h"
 #include "gfx.h"
 #include "vehicle.h"

src/gui.h

@@ -6,7 +6,7 @@
 #define GUI_H
 
 #include "station.h"
-#include "window.h"
+#include "window_gui.h"
 #include "string.h"
 
 /* main_gui.cpp */

src/industry_gui.cpp

@@ -11,7 +11,6 @@
 #include "table/sprites.h"
 #include "map.h"
 #include "gui.h"
-#include "window.h"
 #include "gfx.h"
 #include "command.h"
 #include "viewport.h"

src/intro_gui.cpp

@@ -8,7 +8,6 @@
 #include "strings.h"
 #include "table/sprites.h"
 #include "functions.h"
-#include "window.h"
 #include "gui.h"
 #include "gfx.h"
 #include "player.h"

src/main_gui.cpp

@@ -14,7 +14,6 @@
 #include "table/strings.h"
 #include "map.h"
 #include "tile.h"
-#include "window.h"
 #include "gui.h"
 #include "viewport.h"
 #include "gfx.h"

src/misc_cmd.cpp

@@ -10,7 +10,6 @@
 #include "command.h"
 #include "player.h"
 #include "gfx.h"
-#include "window.h"
 #include "gui.h"
 #include "economy.h"
 #include "network/network.h"

src/misc_gui.cpp

@@ -17,7 +17,6 @@
 #include "strings.h"
 #include "table/tree_land.h"
 #include "map.h"
-#include "window.h"
 #include "gui.h"
 #include "viewport.h"
 #include "gfx.h"

src/music_gui.cpp

@@ -9,13 +9,13 @@
 #include "strings.h"
 #include "functions.h"
 #include "fileio.h"
-#include "window.h"
 #include "gfx.h"
 #include "sound.h"
 #include "macros.h"
 #include "variables.h"
 #include "music.h"
 #include "music/music_driver.hpp"
+#include "window_gui.h"
 
 static byte _music_wnd_cursong;
 static bool _song_is_active;

src/network/network_client.cpp

@@ -17,7 +17,6 @@
 #include "network_gui.h"
 #include "../saveload.h"
 #include "../command.h"
-#include "../window.h"
 #include "../console.h"
 #include "../variables.h"
 #include "../ai/ai.h"

src/network/network_gui.cpp

@@ -16,7 +16,6 @@
 #include "network_client.h"
 #include "network_gui.h"
 #include "network_gamelist.h"
-#include "../window.h"
 #include "../gui.h"
 #include "../gfx.h"
 #include "../command.h"

src/newgrf_gui.cpp

@@ -8,7 +8,6 @@
 #include "variables.h"
 #include "gfx.h"
 #include "gui.h"
-#include "window.h"
 #include "table/strings.h"
 #include "table/sprites.h"
 #include "newgrf.h"

src/news.h

@@ -5,6 +5,8 @@
 #ifndef NEWS_H
 #define NEWS_H
 
+#include "window_type.h"
+
 struct NewsItem {
 	StringID string_id; ///< Message text (sometimes also used for storing other info)
 	uint16 duration;    ///< Remaining time for showing this news message

src/news_gui.cpp

@@ -7,7 +7,6 @@
 #include "strings.h"
 #include "table/sprites.h"
 #include "table/strings.h"
-#include "window.h"
 #include "gui.h"
 #include "viewport.h"
 #include "gfx.h"

src/openttd.cpp

@@ -31,7 +31,7 @@
 #include "tunnel_map.h"
 #include "vehicle.h"
 #include "viewport.h"
-#include "window.h"
+#include "window_gui.h"
 #include "player.h"
 #include "command.h"
 #include "town.h"

src/openttd.h

@@ -32,7 +32,6 @@ struct Pair {
 struct Vehicle;
 struct Depot;
 struct Waypoint;
-struct Window;
 struct Station;
 struct ViewPort;
 struct Town;
@@ -80,7 +79,6 @@ assert_compile(sizeof(DestinationID) == sizeof(DepotID));
 assert_compile(sizeof(DestinationID) == sizeof(WaypointID));
 assert_compile(sizeof(DestinationID) == sizeof(StationID));
 
-typedef int32 WindowNumber;
 
 enum {
 	INVALID_YEAR = -1,
@@ -500,91 +498,6 @@ struct TileTypeProcs {
 };
 
 
-enum WindowClass {
-	WC_NONE,
-	WC_MAIN_WINDOW = WC_NONE,
-	WC_MAIN_TOOLBAR,
-	WC_STATUS_BAR,
-	WC_BUILD_TOOLBAR,
-	WC_NEWS_WINDOW,
-	WC_TOWN_DIRECTORY,
-	WC_STATION_LIST,
-	WC_TOWN_VIEW,
-	WC_SMALLMAP,
-	WC_TRAINS_LIST,
-	WC_ROADVEH_LIST,
-	WC_SHIPS_LIST,
-	WC_AIRCRAFT_LIST,
-	WC_VEHICLE_VIEW,
-	WC_VEHICLE_DETAILS,
-	WC_VEHICLE_REFIT,
-	WC_VEHICLE_ORDERS,
-	WC_STATION_VIEW,
-	WC_VEHICLE_DEPOT,
-	WC_BUILD_VEHICLE,
-	WC_BUILD_BRIDGE,
-	WC_ERRMSG,
-	WC_BUILD_STATION,
-	WC_BUS_STATION,
-	WC_TRUCK_STATION,
-	WC_BUILD_DEPOT,
-	WC_COMPANY,
-	WC_FINANCES,
-	WC_PLAYER_COLOR,
-	WC_QUERY_STRING,
-	WC_SAVELOAD,
-	WC_SELECT_GAME,
-	WC_TOOLBAR_MENU,
-	WC_INCOME_GRAPH,
-	WC_OPERATING_PROFIT,
-	WC_TOOLTIPS,
-	WC_INDUSTRY_VIEW,
-	WC_PLAYER_FACE,
-	WC_LAND_INFO,
-	WC_TOWN_AUTHORITY,
-	WC_SUBSIDIES_LIST,
-	WC_GRAPH_LEGEND,
-	WC_DELIVERED_CARGO,
-	WC_PERFORMANCE_HISTORY,
-	WC_COMPANY_VALUE,
-	WC_COMPANY_LEAGUE,
-	WC_BUY_COMPANY,
-	WC_PAYMENT_RATES,
-	WC_ENGINE_PREVIEW,
-	WC_MUSIC_WINDOW,
-	WC_MUSIC_TRACK_SELECTION,
-	WC_SCEN_LAND_GEN,
-	WC_SCEN_TOWN_GEN,
-	WC_SCEN_INDUSTRY,
-	WC_SCEN_BUILD_ROAD,
-	WC_BUILD_TREES,
-	WC_SEND_NETWORK_MSG,
-	WC_DROPDOWN_MENU,
-	WC_BUILD_INDUSTRY,
-	WC_GAME_OPTIONS,
-	WC_NETWORK_WINDOW,
-	WC_INDUSTRY_DIRECTORY,
-	WC_MESSAGE_HISTORY,
-	WC_CHEATS,
-	WC_PERFORMANCE_DETAIL,
-	WC_CONSOLE,
-	WC_EXTRA_VIEW_PORT,
-	WC_CLIENT_LIST,
-	WC_NETWORK_STATUS_WINDOW,
-	WC_CUSTOM_CURRENCY,
-	WC_REPLACE_VEHICLE,
-	WC_HIGHSCORE,
-	WC_ENDSCREEN,
-	WC_SIGN_LIST,
-	WC_GENERATE_LANDSCAPE,
-	WC_GENERATE_PROGRESS_WINDOW,
-	WC_CONFIRM_POPUP_QUERY,
-	WC_TRANSPARENCY_TOOLBAR,
-	WC_VEHICLE_TIMETABLE,
-	WC_BUILD_SIGNAL,
-	WC_COMPANY_PASSWORD_WINDOW,
-};
-
 
 enum ExpensesType {
 	EXPENSES_CONSTRUCTION =  0,

src/order_gui.cpp

@@ -12,7 +12,6 @@
 #include "functions.h"
 #include "map.h"
 #include "tile.h"
-#include "window.h"
 #include "gui.h"
 #include "gfx.h"
 #include "vehicle.h"

src/player_gui.cpp

@@ -8,7 +8,6 @@
 #include "table/strings.h"
 #include "strings.h"
 #include "functions.h"
-#include "window.h"
 #include "gui.h"
 #include "viewport.h"
 #include "gfx.h"

src/players.cpp

@@ -25,10 +25,10 @@
 #include "engine.h"
 #include "ai/ai.h"
 #include "date.h"
-#include "window.h"
 #include "player_face.h"
 #include "group.h"
 #include "settings.h"
+#include "window_func.h"
 
 /**
  * Sets the local player and updates the patch settings that are set on a

src/rail_cmd.cpp

@@ -29,7 +29,6 @@
 #include "sprite.h"
 #include "depot.h"
 #include "waypoint.h"
-#include "window.h"
 #include "rail.h"
 #include "railtypes.h" // include table for railtypes
 #include "newgrf.h"
@@ -43,6 +42,7 @@
 #include "transparency.h"
 #include "water.h"
 #include "tunnelbridge_map.h"
+#include "window_func.h"
 
 
 const byte _track_sloped_sprites[14] = {

src/rail_gui.cpp

@@ -12,7 +12,6 @@
 #include "date.h"
 #include "map.h"
 #include "tile.h"
-#include "window.h"
 #include "gui.h"
 #include "viewport.h"
 #include "gfx.h"

src/road_cmd.cpp

@@ -15,7 +15,6 @@
 #include "table/strings.h"
 #include "strings.h"
 #include "functions.h"
-#include "window.h"
 #include "map.h"
 #include "landscape.h"
 #include "tile.h"
@@ -36,6 +35,7 @@
 #include "autoslope.h"
 #include "transparency.h"
 #include "tunnelbridge_map.h"
+#include "window_func.h"
 
 
 #define M(x) (1 << (x))

src/road_gui.cpp

@@ -10,7 +10,6 @@
 #include "functions.h"
 #include "map.h"
 #include "tile.h"
-#include "window.h"
 #include "gui.h"
 #include "viewport.h"
 #include "gfx.h"

src/roadveh_gui.cpp

@@ -9,7 +9,6 @@
 #include "roadveh.h"
 #include "table/sprites.h"
 #include "table/strings.h"
-#include "window.h"
 #include "gui.h"
 #include "strings.h"
 #include "vehicle.h"

src/settings.cpp

@@ -1085,7 +1085,6 @@ static void ini_save_setting_list(IniFile *ini, const char *grpname, char **list
 #include "table/strings.h"
 
 /* Begin - Callback Functions for the various settings */
-#include "window.h"
 #include "gui.h"
 #include "town.h"
 #include "gfx.h"

src/settings_gui.cpp

@@ -10,7 +10,6 @@
 #include "strings.h" // XXX GetCurrentCurrencyRate()
 #include "table/sprites.h"
 #include "table/strings.h"
-#include "window.h"
 #include "gui.h"
 #include "gfx.h"
 #include "command.h"

src/signs_gui.cpp

@@ -7,7 +7,6 @@
 #include "table/strings.h"
 #include "table/sprites.h"
 #include "functions.h"
-#include "window.h"
 #include "gui.h"
 #include "gfx.h"
 #include "player.h"

src/smallmap_gui.cpp

@@ -19,7 +19,6 @@
 #include "gui.h"
 #include "tree_map.h"
 #include "tunnel_map.h"
-#include "window.h"
 #include "gfx.h"
 #include "viewport.h"
 #include "player.h"

src/sound.cpp

@@ -10,12 +10,12 @@
 #include "mixer.h"
 #include "sound.h"
 #include "vehicle.h"
-#include "window.h"
 #include "viewport.h"
 #include "fileio.h"
 #include "newgrf_sound.h"
 #include "helpers.hpp"
 #include "fios.h"
+#include "window_gui.h"
 
 static uint _file_count;
 static FileEntry *_files;

src/station.cpp

@@ -14,7 +14,6 @@
 #include "tile.h"
 #include "station.h"
 #include "gfx.h"
-#include "window.h"
 #include "viewport.h"
 #include "command.h"
 #include "town.h"

src/station_cmd.cpp

@@ -4,6 +4,7 @@
 
 #include "stdafx.h"
 #include "openttd.h"
+#include "string.h"
 #include "aircraft.h"
 #include "bridge_map.h"
 #include "cmd_helper.h"
@@ -17,7 +18,6 @@
 #include "tile.h"
 #include "station.h"
 #include "gfx.h"
-#include "window.h"
 #include "viewport.h"
 #include "command.h"
 #include "town.h"

src/station_gui.cpp

@@ -8,7 +8,6 @@
 #include "functions.h"
 #include "strings.h"
 #include "table/strings.h"
-#include "window.h"
 #include "gui.h"
 #include "station.h"
 #include "gfx.h"

src/subsidy_gui.cpp

@@ -7,7 +7,6 @@
 #include "table/strings.h"
 #include "strings.h"
 #include "functions.h"
-#include "window.h"
 #include "station.h"
 #include "industry.h"
 #include "town.h"
@@ -17,6 +16,7 @@
 #include "variables.h"
 #include "date.h"
 #include "cargotype.h"
+#include "window_gui.h"
 
 static void HandleSubsidyClick(int y)
 {

src/terraform_gui.cpp

@@ -11,7 +11,6 @@
 #include "functions.h"
 #include "player.h"
 #include "tile.h"
-#include "window.h"
 #include "gui.h"
 #include "viewport.h"
 #include "gfx.h"

src/timetable_gui.cpp

@@ -13,7 +13,6 @@
 #include "engine.h"
 #include "gui.h"
 #include "string.h"
-#include "window.h"
 #include "vehicle.h"
 #include "cargotype.h"
 #include "depot.h"

src/town_gui.cpp

@@ -10,7 +10,6 @@
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "town.h"
-#include "window.h"
 #include "gfx.h"
 #include "viewport.h"
 #include "gui.h"

src/train_gui.cpp

@@ -9,7 +9,6 @@
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "strings.h"
-#include "window.h"
 #include "gui.h"
 #include "vehicle.h"
 #include "viewport.h"

src/transparency_gui.cpp

@@ -5,7 +5,6 @@
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "functions.h"
-#include "window.h"
 #include "gui.h"
 #include "viewport.h"
 #include "gfx.h"

src/unix.cpp

@@ -5,10 +5,10 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "functions.h"
-#include "window.h"
 #include "string.h"
 #include "table/strings.h"
 #include "variables.h"
+#include "gui.h"
 
 #include <dirent.h>
 #include <unistd.h>

src/vehicle.h

@@ -10,6 +10,7 @@
 #include "track_type.h"
 #include "rail_type.h"
 #include "road_type.h"
+#include "window_type.h"
 #include "cargopacket.h"
 #include "texteff.hpp"
 

src/vehicle_gui.cpp

@@ -12,7 +12,6 @@
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "vehicle.h"
-#include "window.h"
 #include "engine.h"
 #include "gui.h"
 #include "command.h"

src/vehicle_gui.h

@@ -5,7 +5,7 @@
 #ifndef VEHICLE_GUI_H
 #define VEHICLE_GUI_H
 
-#include "window.h"
+#include "window_gui.h"
 #include "vehicle.h"
 
 void DrawVehicleProfitButton(const Vehicle *v, int x, int y);

src/video/dedicated_v.cpp

@@ -9,7 +9,6 @@
 #include "../functions.h"
 #include "../gfx.h"
 #include "../network/network.h"
-#include "../window.h"
 #include "../console.h"
 #include "../variables.h"
 #include "../genworld.h"

src/video/null_v.cpp

@@ -4,7 +4,6 @@
 #include "../openttd.h"
 #include "../gfx.h"
 #include "../variables.h"
-#include "../window.h"
 #include "../debug.h"
 #include "../blitter/factory.hpp"
 #include "null_v.h"

src/video/sdl_v.cpp

@@ -10,8 +10,6 @@
 #include "../gfx.h"
 #include "../macros.h"
 #include "../sdl.h"
-#include "../window.h"
-#include "../network/network.h"
 #include "../variables.h"
 #include "../blitter/factory.hpp"
 #include "sdl_v.h"

src/video/win32_v.cpp

@@ -5,10 +5,8 @@
 #include "../functions.h"
 #include "../gfx.h"
 #include "../macros.h"
-#include "../network/network.h"
 #include "../variables.h"
 #include "../win32.h"
-#include "../window.h"
 #include "../blitter/factory.hpp"
 #include "win32_v.h"
 #include <windows.h>

src/viewport.cpp

@@ -14,7 +14,6 @@
 #include "landscape.h"
 #include "map.h"
 #include "viewport.h"
-#include "window.h"
 #include "vehicle.h"
 #include "station.h"
 #include "gfx.h"

src/viewport.h

@@ -6,6 +6,7 @@
 #define VIEWPORT_H
 
 #include "zoom.hpp"
+#include "window_type.h"
 
 struct ViewPort {
 	int left,top;                       // screen coordinates for the viewport

src/widget.cpp

@@ -8,9 +8,9 @@
 #include "player.h"
 #include "table/sprites.h"
 #include "table/strings.h"
-#include "window.h"
 #include "gfx.h"
 #include "viewport.h"
+#include "window_gui.h"
 
 static Point HandleScrollbarHittest(const Scrollbar *sb, int top, int bottom)
 {

src/win32.cpp

@@ -11,7 +11,6 @@
 #include "saveload.h"
 #include "string.h"
 #include "gfx.h"
-#include "window.h"
 #include "fileio.h"
 #include <windows.h>
 #include <winnt.h>

src/window.cpp

@@ -9,7 +9,6 @@
 #include "functions.h"
 #include "map.h"
 #include "player.h"
-#include "window.h"
 #include "gfx.h"
 #include "viewport.h"
 #include "console.h"
@@ -18,6 +17,7 @@
 #include "genworld.h"
 #include "helpers.hpp"
 #include "blitter/factory.hpp"
+#include "window_gui.h"
 
 /* delta between mouse cursor and upper left corner of dragged window */
 static Point _drag_delta;

src/window_func.h

@@ -0,0 +1,40 @@
+/* $Id$ */
+
+/** @file window.h Window functions not directly related to making/drawing windows. */
+
+#ifndef WINDOW_FUNC_H
+#define WINDOW_FUNC_H
+
+#include "window_type.h"
+
+/**
+ * Marks the window as dirty for repaint.
+ *
+ * @ingroup dirty
+ */
+void SetWindowDirty(const Window *w);
+void SendWindowMessage(WindowClass wnd_class, WindowNumber wnd_num, int msg, int wparam, int lparam);
+void SendWindowMessageClass(WindowClass wnd_class, int msg, int wparam, int lparam);
+
+Window *FindWindowById(WindowClass cls, WindowNumber number);
+void DeleteWindow(Window *w);
+void DeletePlayerWindows(PlayerID pi);
+void ChangeWindowOwner(PlayerID old_player, PlayerID new_player);
+
+void ResizeWindow(Window *w, int x, int y);
+
+void InitWindowSystem();
+void UnInitWindowSystem();
+void ResetWindowSystem();
+void InputLoop();
+void InvalidateThisWindowData(Window *w);
+void InvalidateWindowData(WindowClass cls, WindowNumber number);
+void RelocateAllWindows(int neww, int newh);
+
+void DeleteNonVitalWindows();
+void DeleteAllNonVitalWindows();
+void HideVitalWindows();
+void ShowVitalWindows();
+Window **FindWindowZPosition(const Window *w);
+
+#endif /* WINDOW_FUNC_H */

src/window_gui.h

@@ -1,9 +1,9 @@
 /* $Id$ */
 
-/** @file window.h regroups declarations for all windowing system, as well as a few helper functions */
+/** @file window_gui.h Functions, definitions and such used only by the GUI. */
 
-#ifndef WINDOW_H
-#define WINDOW_H
+#ifndef WINDOW_GUI_H
+#define WINDOW_GUI_H
 
 #include "macros.h"
 #include "string.h"
@@ -827,4 +827,4 @@ inline bool Window::IsWidgetLowered(byte widget_index) const
 	return HasBit(this->widget[widget_index].display_flags, WIDG_LOWERED);
 }
 
-#endif /* WINDOW_H */
+#endif /* WINDOW_GUI_H */

src/window_type.h

@@ -0,0 +1,98 @@
+/* $Id$ */
+
+/** @file window_type.h Types related to windows */
+
+#ifndef WINDOW_TYPE_H
+#define WINDOW_TYPE_H
+
+#include "core/enum_type.hpp"
+
+enum WindowClass {
+	WC_NONE,
+	WC_MAIN_WINDOW = WC_NONE,
+	WC_MAIN_TOOLBAR,
+	WC_STATUS_BAR,
+	WC_BUILD_TOOLBAR,
+	WC_NEWS_WINDOW,
+	WC_TOWN_DIRECTORY,
+	WC_STATION_LIST,
+	WC_TOWN_VIEW,
+	WC_SMALLMAP,
+	WC_TRAINS_LIST,
+	WC_ROADVEH_LIST,
+	WC_SHIPS_LIST,
+	WC_AIRCRAFT_LIST,
+	WC_VEHICLE_VIEW,
+	WC_VEHICLE_DETAILS,
+	WC_VEHICLE_REFIT,
+	WC_VEHICLE_ORDERS,
+	WC_STATION_VIEW,
+	WC_VEHICLE_DEPOT,
+	WC_BUILD_VEHICLE,
+	WC_BUILD_BRIDGE,
+	WC_ERRMSG,
+	WC_BUILD_STATION,
+	WC_BUS_STATION,
+	WC_TRUCK_STATION,
+	WC_BUILD_DEPOT,
+	WC_COMPANY,
+	WC_FINANCES,
+	WC_PLAYER_COLOR,
+	WC_QUERY_STRING,
+	WC_SAVELOAD,
+	WC_SELECT_GAME,
+	WC_TOOLBAR_MENU,
+	WC_INCOME_GRAPH,
+	WC_OPERATING_PROFIT,
+	WC_TOOLTIPS,
+	WC_INDUSTRY_VIEW,
+	WC_PLAYER_FACE,
+	WC_LAND_INFO,
+	WC_TOWN_AUTHORITY,
+	WC_SUBSIDIES_LIST,
+	WC_GRAPH_LEGEND,
+	WC_DELIVERED_CARGO,
+	WC_PERFORMANCE_HISTORY,
+	WC_COMPANY_VALUE,
+	WC_COMPANY_LEAGUE,
+	WC_BUY_COMPANY,
+	WC_PAYMENT_RATES,
+	WC_ENGINE_PREVIEW,
+	WC_MUSIC_WINDOW,
+	WC_MUSIC_TRACK_SELECTION,
+	WC_SCEN_LAND_GEN,
+	WC_SCEN_TOWN_GEN,
+	WC_SCEN_INDUSTRY,
+	WC_SCEN_BUILD_ROAD,
+	WC_BUILD_TREES,
+	WC_SEND_NETWORK_MSG,
+	WC_DROPDOWN_MENU,
+	WC_BUILD_INDUSTRY,
+	WC_GAME_OPTIONS,
+	WC_NETWORK_WINDOW,
+	WC_INDUSTRY_DIRECTORY,
+	WC_MESSAGE_HISTORY,
+	WC_CHEATS,
+	WC_PERFORMANCE_DETAIL,
+	WC_CONSOLE,
+	WC_EXTRA_VIEW_PORT,
+	WC_CLIENT_LIST,
+	WC_NETWORK_STATUS_WINDOW,
+	WC_CUSTOM_CURRENCY,
+	WC_REPLACE_VEHICLE,
+	WC_HIGHSCORE,
+	WC_ENDSCREEN,
+	WC_SIGN_LIST,
+	WC_GENERATE_LANDSCAPE,
+	WC_GENERATE_PROGRESS_WINDOW,
+	WC_CONFIRM_POPUP_QUERY,
+	WC_TRANSPARENCY_TOOLBAR,
+	WC_VEHICLE_TIMETABLE,
+	WC_BUILD_SIGNAL,
+	WC_COMPANY_PASSWORD_WINDOW,
+};
+
+struct Window;
+typedef int32 WindowNumber;
+
+#endif /* WINDOW_TYPE_H */