# HG changeset patch
# User yexo <yexo@openttd.org>
# Date 1316093187 0
# Node ID da734088966410fa66f2b7e0b91634654a375fef
# Parent  87850d906b1389fcca0e9927fdd9ef882303b616
(svn r22932) -Fix [FS#4766]: disable the white border on window creation for several windows (based on patch by monoid)

diff --git a/src/highscore_gui.cpp b/src/highscore_gui.cpp
--- a/src/highscore_gui.cpp
+++ b/src/highscore_gui.cpp
@@ -34,6 +34,7 @@
 	EndGameHighScoreBaseWindow(const WindowDesc *desc) : Window()
 	{
 		this->InitNested(desc);
+		CLRBITS(this->flags4, WF_WHITE_BORDER_MASK);
 		ResizeWindow(this, _screen.width - this->width, _screen.height - this->height);
 	}
 
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -244,6 +244,7 @@
 	MainWindow() : Window()
 	{
 		this->InitNested(&_main_window_desc, 0);
+		CLRBITS(this->flags4, WF_WHITE_BORDER_MASK);
 		ResizeWindow(this, _screen.width, _screen.height);
 
 		NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(MW_VIEWPORT);
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -902,7 +902,7 @@
 
 		this->InitNested(&_tool_tips_desc);
 
-		this->flags4 &= ~WF_WHITE_BORDER_MASK; // remove white-border from tooltip
+		CLRBITS(this->flags4, WF_WHITE_BORDER_MASK); // remove white-border from tooltip
 	}
 
 	virtual Point OnInitialPosition(const WindowDesc *desc, int16 sm_width, int16 sm_height, int window_number)
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -1801,8 +1801,8 @@
 			this->AddAction(STR_NETWORK_CLIENTLIST_BAN, &ClientList_Ban);
 		}
 
-		this->flags4 &= ~WF_WHITE_BORDER_MASK;
 		this->InitNested(desc, client_id);
+		CLRBITS(this->flags4, WF_WHITE_BORDER_MASK);
 	}
 
 	virtual Point OnInitialPosition(const WindowDesc *desc, int16 sm_width, int16 sm_height, int window_number)
diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp
--- a/src/statusbar_gui.cpp
+++ b/src/statusbar_gui.cpp
@@ -89,11 +89,11 @@
 
 	StatusBarWindow(const WindowDesc *desc) : Window()
 	{
-		CLRBITS(this->flags4, WF_WHITE_BORDER_MASK);
 		this->ticker_scroll    =   TICKER_STOP;
 		this->reminder_timeout = REMINDER_STOP;
 
 		this->InitNested(desc);
+		CLRBITS(this->flags4, WF_WHITE_BORDER_MASK);
 		PositionStatusbar(this);
 	}
 
diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp
--- a/src/widgets/dropdown.cpp
+++ b/src/widgets/dropdown.cpp
@@ -148,7 +148,7 @@
 		this->GetWidget<NWidgetStacked>(DDM_SHOW_SCROLL)->SetDisplayedPlane(scroll ? 0 : SZSP_NONE);
 
 		this->FinishInitNested(&_dropdown_desc, 0);
-		this->flags4 &= ~WF_WHITE_BORDER_MASK;
+		CLRBITS(this->flags4, WF_WHITE_BORDER_MASK);
 
 		/* Total length of list */
 		int list_height = 0;