From 0fa8485b4c265526e5929b579c01ab3e9e665f59 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Thu, 12 Mar 2015 21:43:35 +0200 Subject: [PATCH] Removed references to tablet bar, it's not needed anymore --- src/script/api/game/game_window.hpp.sq | 1 - src/script/api/script_window.hpp | 6 ------ src/window.cpp | 1 - src/window_type.h | 6 ------ 4 files changed, 14 deletions(-) diff --git a/src/script/api/game/game_window.hpp.sq b/src/script/api/game/game_window.hpp.sq index dfccacf1b2..9b5232d128 100644 --- a/src/script/api/game/game_window.hpp.sq +++ b/src/script/api/game/game_window.hpp.sq @@ -40,7 +40,6 @@ void SQGSWindow_Register(Squirrel *engine) SQGSWindow.DefSQConst(engine, ScriptWindow::WC_MAIN_WINDOW, "WC_MAIN_WINDOW"); SQGSWindow.DefSQConst(engine, ScriptWindow::WC_MAIN_TOOLBAR, "WC_MAIN_TOOLBAR"); SQGSWindow.DefSQConst(engine, ScriptWindow::WC_STATUS_BAR, "WC_STATUS_BAR"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WC_TABLET_BAR, "WC_TABLET_BAR"); SQGSWindow.DefSQConst(engine, ScriptWindow::WC_BUILD_TOOLBAR, "WC_BUILD_TOOLBAR"); SQGSWindow.DefSQConst(engine, ScriptWindow::WC_SCEN_BUILD_TOOLBAR, "WC_SCEN_BUILD_TOOLBAR"); SQGSWindow.DefSQConst(engine, ScriptWindow::WC_BUILD_TREES, "WC_BUILD_TREES"); diff --git a/src/script/api/script_window.hpp b/src/script/api/script_window.hpp index e61fa1a532..4d91c8583b 100644 --- a/src/script/api/script_window.hpp +++ b/src/script/api/script_window.hpp @@ -148,12 +148,6 @@ public: */ WC_STATUS_BAR = ::WC_STATUS_BAR, - /** - * Tablet bar; %Window numbers: - * - 0 = #StatusbarWidgets - */ - WC_TABLET_BAR = ::WC_TABLET_BAR, - /** * Build toolbar; %Window numbers: * - #TRANSPORT_RAIL = #RailToolbarWidgets diff --git a/src/window.cpp b/src/window.cpp index 6943916d0c..5e70616d9b 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -1293,7 +1293,6 @@ static uint GetWindowZPriority(const Window *w) ++z_priority; case WC_NEWS_WINDOW: - case WC_TABLET_BAR: ++z_priority; default: diff --git a/src/window_type.h b/src/window_type.h index d0fa1ad946..fd39bc36b9 100644 --- a/src/window_type.h +++ b/src/window_type.h @@ -65,12 +65,6 @@ enum WindowClass { */ WC_STATUS_BAR, - /** - * Tablet bar; %Window numbers: - * - 0 = #StatusbarWidgets - */ - WC_TABLET_BAR, - /** * Build toolbar; %Window numbers: * - #TRANSPORT_RAIL = #RailToolbarWidgets