cpp/openttd-patchpack/source Changeset - r19745:d8f95208ad9e

Changeset - r19745:d8f95208ad9e

Parent rev.

Child rev.

[Not reviewed]

master

0 41 0

frosch - 12 years ago 2012-11-11 16:10:43
frosch@openttd.org

(svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default.

41 files changed with 88 insertions and 89 deletions:

src/ai/ai_gui.cpp

src/airport_gui.cpp

src/autoreplace_gui.cpp

src/bootstrap_gui.cpp

src/build_vehicle_gui.cpp

src/cheat_gui.cpp

src/company_gui.cpp

src/date_gui.cpp

src/depot_gui.cpp

src/fios_gui.cpp

src/genworld_gui.cpp

src/graph_gui.cpp

src/group_gui.cpp

src/industry_gui.cpp

src/intro_gui.cpp

src/misc_gui.cpp

src/music_gui.cpp

src/network/network_content_gui.cpp

src/network/network_gui.cpp

src/newgrf_debug_gui.cpp

src/newgrf_gui.cpp

src/news_gui.cpp

src/order_gui.cpp

src/osk_gui.cpp

src/rail_gui.cpp

src/settings_gui.cpp

src/signs_gui.cpp

src/smallmap_gui.cpp

src/station_gui.cpp

src/statusbar_gui.cpp

src/terraform_gui.cpp

src/textfile_gui.cpp

src/timetable_gui.cpp

src/toolbar_gui.cpp

src/town_gui.cpp

src/tree_gui.cpp

src/vehicle_gui.cpp

src/viewport_gui.cpp

src/waypoint_gui.cpp

src/window.cpp

src/window_gui.h

0 comments (0 inline, 0 general)

src/ai/ai_gui.cpp

➞

Show inline comments

@@ @@ -257,13 +257,13 @@ static const NWidgetPart _nested_ai_list @@
 };
 /** Window definition for the ai list window. */
 static const WindowDesc _ai_list_desc(
 	WDP_CENTER, 200, 234,
 	WC_AI_LIST, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_ai_list_widgets, lengthof(_nested_ai_list_widgets)
 );
 /**
  * Open the AI list window to chose an AI for the given company slot.
  * @param slot The slot to change the AI of.
@@ @@ -622,13 +622,13 @@ static const NWidgetPart _nested_ai_sett @@
 };
 /** Window definition for the AI settings window. */
 static const WindowDesc _ai_settings_desc(
 	WDP_CENTER, 500, 208,
 	WC_AI_SETTINGS, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_ai_settings_widgets, lengthof(_nested_ai_settings_widgets)
 );
 /**
  * Open the AI settings window to change the AI settings for an AI.
  * @param slot The CompanyID of the AI to change the settings.
@@ @@ -716,13 +716,13 @@ static const NWidgetPart _nested_ai_conf @@
 };
 /** Window definition for the configure AI window. */
 static const WindowDesc _ai_config_desc(
 	WDP_CENTER, 0, 0,
 	WC_GAME_OPTIONS, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_ai_config_widgets, lengthof(_nested_ai_config_widgets)
 );
 /**
  * Window to configure which AIs will start.
  */
@@ @@ -1516,13 +1516,13 @@ static const NWidgetPart _nested_ai_debu @@
 };
 /** Window definition for the AI debug window. */
 static const WindowDesc _ai_debug_desc(
 	WDP_AUTO, 600, 450,
 	WC_AI_DEBUG, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_ai_debug_widgets, lengthof(_nested_ai_debug_widgets)
 );
 /**
  * Open the AI debug window and select the given company.
  * @param show_company Display debug information about this AI company.

src/airport_gui.cpp

➞

Show inline comments

@@ @@ -554,13 +554,13 @@ static const NWidgetPart _nested_build_a @@
 	EndContainer(),
 };
 static const WindowDesc _build_airport_desc(
 	WDP_AUTO, 0, 0,
 	WC_BUILD_STATION, WC_BUILD_TOOLBAR,
-	WDF_CONSTRUCTION | WDF_UNCLICK_BUTTONS,
 	WDF_CONSTRUCTION,
 	_nested_build_airport_widgets, lengthof(_nested_build_airport_widgets)
 );
 static void ShowBuildAirportPicker(Window *parent)
+{
 	new BuildAirportWindow(&_build_airport_desc, parent);

src/autoreplace_gui.cpp

➞

Show inline comments

@@ @@ -565,13 +565,13 @@ static const NWidgetPart _nested_replace @@
 	EndContainer(),
 };
 static const WindowDesc _replace_rail_vehicle_desc(
 	WDP_AUTO, 500, 140,
 	WC_REPLACE_VEHICLE, WC_NONE,
-	WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION,
 	WDF_CONSTRUCTION,
 	_nested_replace_rail_vehicle_widgets, lengthof(_nested_replace_rail_vehicle_widgets)
 );
 static const NWidgetPart _nested_replace_vehicle_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY),
@@ @@ -597,13 +597,13 @@ static const NWidgetPart _nested_replace @@
 	EndContainer(),
 };
 static const WindowDesc _replace_vehicle_desc(
 	WDP_AUTO, 456, 118,
 	WC_REPLACE_VEHICLE, WC_NONE,
-	WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION,
 	WDF_CONSTRUCTION,
 	_nested_replace_vehicle_widgets, lengthof(_nested_replace_vehicle_widgets)
 );
 /**
  * Show the autoreplace configuration window for a particular group.
  * @param id_g The group to replace the vehicles for.

src/bootstrap_gui.cpp

➞

Show inline comments

@@ @@ -115,13 +115,13 @@ static const NWidgetPart _bootstrap_quer @@
 };
 /** The window description for the query. */
 static const WindowDesc _bootstrap_query_desc(
 	WDP_CENTER, 0, 0,
 	WC_CONFIRM_POPUP_QUERY, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_bootstrap_query_widgets, lengthof(_bootstrap_query_widgets)
 );
 /** The window for the query. It can't use the generic query window as that uses sprites that don't exist yet. */
 class BootstrapAskForDownloadWindow : public Window, ContentCallback {
 	Dimension button_size; ///< The dimension of the button

src/build_vehicle_gui.cpp

➞

Show inline comments

@@ @@ -1405,13 +1405,13 @@ struct BuildVehicleWindow : Window { @@
+	}
 };
 static const WindowDesc _build_vehicle_desc(
 	WDP_AUTO, 240, 268,
 	WC_BUILD_VEHICLE, WC_NONE,
-	WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION,
 	WDF_CONSTRUCTION,
 	_nested_build_vehicle_widgets, lengthof(_nested_build_vehicle_widgets)
 );
 void ShowBuildVehicleWindow(TileIndex tile, VehicleType type)
+{
 	/* We want to be able to open both Available Train as Available Ships,

src/cheat_gui.cpp

➞

Show inline comments

@@ @@ -348,13 +348,13 @@ struct CheatWindow : Window { @@
 };
 /** Window description of the cheats GUI. */
 static const WindowDesc _cheats_desc(
 	WDP_AUTO, 0, 0,
 	WC_CHEATS, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_cheat_widgets, lengthof(_nested_cheat_widgets)
 );
 /** Open cheat window. */
 void ShowCheatWindow()
+{

src/company_gui.cpp

➞

Show inline comments

@@ @@ -463,13 +463,13 @@ struct CompanyFinancesWindow : Window { @@
 /** First conservative estimate of the maximum amount of money */
 Money CompanyFinancesWindow::max_money = INT32_MAX;
 static const WindowDesc _company_finances_desc(
 	WDP_AUTO, 0, 0,
 	WC_FINANCES, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_company_finances_widgets, lengthof(_nested_company_finances_widgets)
 );
 /**
  * Open the finances window of a company.
  * @param company Company to show finances of.
@@ @@ -1479,13 +1479,13 @@ const StringID SelectCompanyManagerFaceW @@
 };
 /** Company manager face selection window description */
 static const WindowDesc _select_company_manager_face_desc(
 	WDP_AUTO, 0, 0,
 	WC_COMPANY_MANAGER_FACE, WC_NONE,
-	WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION,
 	WDF_CONSTRUCTION,
 	_nested_select_company_manager_face_widgets, lengthof(_nested_select_company_manager_face_widgets)
 );
 /**
  * Open the simple/advanced company manager face selection window
+ *
@@ @@ -1833,13 +1833,13 @@ struct CompanyInfrastructureWindow : Win @@
+	}
 };
 static const WindowDesc _company_infrastructure_desc(
 	WDP_AUTO, 0, 0,
 	WC_COMPANY_INFRASTRUCTURE, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_company_infrastructure_widgets, lengthof(_nested_company_infrastructure_widgets)
 );
 /**
  * Open the infrastructure window of a company.
  * @param company Company to show infrastructure of.
@@ @@ -2398,13 +2398,13 @@ struct CompanyWindow : Window @@
+	}
 };
 static const WindowDesc _company_desc(
 	WDP_AUTO, 0, 0,
 	WC_COMPANY, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_company_widgets, lengthof(_nested_company_widgets)
 );
 /**
  * Show the window with the overview of the company.
  * @param company The company to show the window for.

src/date_gui.cpp

➞

Show inline comments

@@ @@ -196,13 +196,13 @@ static const NWidgetPart _nested_set_dat @@
 };
 /** Description of the date setting window. */
 static const WindowDesc _set_date_desc(
 	WDP_CENTER, 0, 0,
 	WC_SET_DATE, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_set_date_widgets, lengthof(_nested_set_date_widgets)
 );
 /**
  * Create the new 'set date' window
  * @param window_number number for the window

src/depot_gui.cpp

➞

Show inline comments

@@ @@ -77,34 +77,34 @@ static const NWidgetPart _nested_train_d @@
 	EndContainer(),
 };
 static const WindowDesc _train_depot_desc(
 	WDP_AUTO, 362, 123,
 	WC_VEHICLE_DEPOT, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_train_depot_widgets, lengthof(_nested_train_depot_widgets)
 );
 static const WindowDesc _road_depot_desc(
 	WDP_AUTO, 316, 97,
 	WC_VEHICLE_DEPOT, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_train_depot_widgets, lengthof(_nested_train_depot_widgets)
 );
 static const WindowDesc _ship_depot_desc(
 	WDP_AUTO, 306, 99,
 	WC_VEHICLE_DEPOT, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_train_depot_widgets, lengthof(_nested_train_depot_widgets)
 );
 static const WindowDesc _aircraft_depot_desc(
 	WDP_AUTO, 332, 99,
 	WC_VEHICLE_DEPOT, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_train_depot_widgets, lengthof(_nested_train_depot_widgets)
 );
 extern void DepotSortList(VehicleList *list);
 /**

src/fios_gui.cpp

➞

Show inline comments

@@ @@ -709,29 +709,29 @@ public: @@
 };
 /** Load game/scenario */
 static const WindowDesc _load_dialog_desc(
 	WDP_CENTER, 500, 294,
 	WC_SAVELOAD, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_load_dialog_widgets, lengthof(_nested_load_dialog_widgets)
 );
 /** Load heightmap */
 static const WindowDesc _load_heightmap_dialog_desc(
 	WDP_CENTER, 257, 320,
 	WC_SAVELOAD, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_load_heightmap_dialog_widgets, lengthof(_nested_load_heightmap_dialog_widgets)
 );
 /** Save game/scenario */
 static const WindowDesc _save_dialog_desc(
 	WDP_CENTER, 500, 294,
 	WC_SAVELOAD, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_save_dialog_widgets, lengthof(_nested_save_dialog_widgets)
 );
 /**
  * These values are used to convert the file/operations mode into a corresponding file type.
  * So each entry, as expressed by the related comment, is based on the enum

src/genworld_gui.cpp

➞

Show inline comments

@@ @@ -809,20 +809,20 @@ struct GenerateLandscapeWindow : public @@
+	}
 };
 static const WindowDesc _generate_landscape_desc(
 	WDP_CENTER, 0, 0,
 	WC_GENERATE_LANDSCAPE, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_generate_landscape_widgets, lengthof(_nested_generate_landscape_widgets)
 );
 static const WindowDesc _heightmap_load_desc(
 	WDP_CENTER, 0, 0,
 	WC_GENERATE_LANDSCAPE, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_heightmap_load_widgets, lengthof(_nested_heightmap_load_widgets)
 );
 static void _ShowGenerateLandscape(GenenerateLandscapeWindowMode mode)
+{
 	uint x = 0;
@@ @@ -1110,13 +1110,13 @@ static const NWidgetPart _nested_create_ @@
 	EndContainer(),
 };
 static const WindowDesc _create_scenario_desc(
 	WDP_CENTER, 0, 0,
 	WC_GENERATE_LANDSCAPE, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_create_scenario_widgets, lengthof(_nested_create_scenario_widgets)
 );
 /** Show the window to create a scenario. */
 void ShowCreateScenario()
+{
@@ @@ -1138,13 +1138,13 @@ static const NWidgetPart _nested_generat @@
 };
 static const WindowDesc _generate_progress_desc(
 	WDP_CENTER, 0, 0,
 	WC_MODAL_PROGRESS, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_generate_progress_widgets, lengthof(_nested_generate_progress_widgets)
 );
 struct GenWorldStatus {
 	uint percent;
 	StringID cls;

src/graph_gui.cpp

➞

Show inline comments

@@ @@ -642,13 +642,13 @@ static const NWidgetPart _nested_operati @@
 	EndContainer(),
 };
 static const WindowDesc _operating_profit_desc(
 	WDP_AUTO, 0, 0,
 	WC_OPERATING_PROFIT, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_operating_profit_widgets, lengthof(_nested_operating_profit_widgets)
 );
 void ShowOperatingProfitGraph()
+{
@@ @@ -692,13 +692,13 @@ static const NWidgetPart _nested_income_ @@
 	EndContainer(),
 };
 static const WindowDesc _income_graph_desc(
 	WDP_AUTO, 0, 0,
 	WC_INCOME_GRAPH, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_income_graph_widgets, lengthof(_nested_income_graph_widgets)
 );
 void ShowIncomeGraph()
+{
 	AllocateWindowDescFront<IncomeGraphWindow>(&_income_graph_desc, 0);
@@ @@ -740,13 +740,13 @@ static const NWidgetPart _nested_deliver @@
 	EndContainer(),
 };
 static const WindowDesc _delivered_cargo_graph_desc(
 	WDP_AUTO, 0, 0,
 	WC_DELIVERED_CARGO, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_delivered_cargo_graph_widgets, lengthof(_nested_delivered_cargo_graph_widgets)
 );
 void ShowDeliveredCargoGraph()
+{
 	AllocateWindowDescFront<DeliveredCargoGraphWindow>(&_delivered_cargo_graph_desc, 0);
@@ @@ -795,13 +795,13 @@ static const NWidgetPart _nested_perform @@
 	EndContainer(),
 };
 static const WindowDesc _performance_history_desc(
 	WDP_AUTO, 0, 0,
 	WC_PERFORMANCE_HISTORY, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_performance_history_widgets, lengthof(_nested_performance_history_widgets)
 );
 void ShowPerformanceHistoryGraph()
+{
 	AllocateWindowDescFront<PerformanceHistoryGraphWindow>(&_performance_history_desc, 0);
@@ @@ -843,13 +843,13 @@ static const NWidgetPart _nested_company @@
 	EndContainer(),
 };
 static const WindowDesc _company_value_graph_desc(
 	WDP_AUTO, 0, 0,
 	WC_COMPANY_VALUE, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_company_value_graph_widgets, lengthof(_nested_company_value_graph_widgets)
 );
 void ShowCompanyValueGraph()
+{
 	AllocateWindowDescFront<CompanyValueGraphWindow>(&_company_value_graph_desc, 0);
@@ @@ -1073,13 +1073,13 @@ static const NWidgetPart _nested_cargo_p @@
 	EndContainer(),
 };
 static const WindowDesc _cargo_payment_rates_desc(
 	WDP_AUTO, 0, 0,
 	WC_PAYMENT_RATES, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_cargo_payment_rates_widgets, lengthof(_nested_cargo_payment_rates_widgets)
 );
 void ShowCargoPaymentRates()
+{

src/group_gui.cpp

➞

Show inline comments

@@ @@ -798,20 +798,20 @@ public: @@
 };
 static WindowDesc _other_group_desc(
 	WDP_AUTO, 460, 246,
 	WC_INVALID, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_group_widgets, lengthof(_nested_group_widgets)
 );
 static const WindowDesc _train_group_desc(
 	WDP_AUTO, 525, 246,
 	WC_TRAINS_LIST, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_group_widgets, lengthof(_nested_group_widgets)
 );
 /**
  * Show the group window for the given company and vehicle type.
  * @param company The company to show the window for.

src/industry_gui.cpp

➞

Show inline comments

@@ @@ -1012,13 +1012,13 @@ static const NWidgetPart _nested_industr @@
 };
 /** Window definition of the view industry gui */
 static const WindowDesc _industry_view_desc(
 	WDP_AUTO, 260, 120,
 	WC_INDUSTRY_VIEW, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_industry_view_widgets, lengthof(_nested_industry_view_widgets)
 );
 void ShowIndustryViewWindow(int industry)
+{
 	AllocateWindowDescFront<IndustryViewWindow>(&_industry_view_desc, industry);
@@ @@ -1383,13 +1383,13 @@ const StringID IndustryDirectoryWindow:: @@
 /** Window definition of the industry directory gui */
 static const WindowDesc _industry_directory_desc(
 	WDP_AUTO, 428, 190,
 	WC_INDUSTRY_DIRECTORY, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_industry_directory_widgets, lengthof(_nested_industry_directory_widgets)
 );
 void ShowIndustryDirectory()
+{
 	AllocateWindowDescFront<IndustryDirectoryWindow>(&_industry_directory_desc, 0);

src/intro_gui.cpp

➞

Show inline comments

@@ @@ -262,13 +262,13 @@ static const NWidgetPart _nested_select_ @@
 	EndContainer(),
 };
 static const WindowDesc _select_game_desc(
 	WDP_CENTER, 0, 0,
 	WC_SELECT_GAME, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_select_game_widgets, lengthof(_nested_select_game_widgets)
 );
 void ShowSelectGameWindow()
+{
 	new SelectGameWindow(&_select_game_desc);

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -1105,13 +1105,13 @@ static const NWidgetPart _nested_query_w @@
 	EndContainer(),
 };
 static const WindowDesc _query_desc(
 	WDP_CENTER, 0, 0,
 	WC_CONFIRM_POPUP_QUERY, WC_NONE,
-	WDF_UNCLICK_BUTTONS | WDF_MODAL,
 	WDF_MODAL,
 	_nested_query_widgets, lengthof(_nested_query_widgets)
 );
 /**
  * Show a modal confirmation window with standard 'yes' and 'no' buttons
  * The window is aligned to the centre of its parent.

src/music_gui.cpp

➞

Show inline comments

@@ @@ -495,13 +495,13 @@ static const NWidgetPart _nested_music_t @@
 	EndContainer(),
 };
 static const WindowDesc _music_track_selection_desc(
 	WDP_AUTO, 0, 0,
 	WC_MUSIC_TRACK_SELECTION, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_music_track_selection_widgets, lengthof(_nested_music_track_selection_widgets)
 );
 static void ShowMusicTrackSelection()
+{
 	AllocateWindowDescFront<MusicTrackSelectionWindow>(&_music_track_selection_desc, 0);
@@ @@ -758,13 +758,13 @@ static const NWidgetPart _nested_music_w @@
 	EndContainer(),
 };
 static const WindowDesc _music_window_desc(
 	WDP_AUTO, 0, 0,
 	WC_MUSIC_WINDOW, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_music_window_widgets, lengthof(_nested_music_window_widgets)
 );
 void ShowMusicWindow()
+{
 	if (BaseMusic::GetUsedSet()->num_available == 0) ShowErrorMessage(STR_ERROR_NO_SONGS, INVALID_STRING_ID, WL_WARNING);

src/network/network_content_gui.cpp

➞

Show inline comments

@@ @@ -965,13 +965,13 @@ static const NWidgetPart _nested_network @@
 };
 /** Window description of the content list */
 static const WindowDesc _network_content_list_desc(
 	WDP_CENTER, 630, 460,
 	WC_NETWORK_WINDOW, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_network_content_list_widgets, lengthof(_nested_network_content_list_widgets)
 );
 /**
  * Show the content list window with a given set of content
  * @param cv the content to show, or NULL when it has to search for itself

src/network/network_gui.cpp

➞

Show inline comments

@@ @@ -983,13 +983,13 @@ static const NWidgetPart _nested_network @@
 	EndContainer(),
 };
 static const WindowDesc _network_game_window_desc(
 	WDP_CENTER, 1000, 730,
 	WC_NETWORK_WINDOW, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_network_game_widgets, lengthof(_nested_network_game_widgets)
 );
 void ShowNetworkGameWindow()
+{
 	static bool first = true;
@@ @@ -1321,13 +1321,13 @@ static const NWidgetPart _nested_network @@
 	EndContainer(),
 };
 static const WindowDesc _network_start_server_window_desc(
 	WDP_CENTER, 0, 0,
 	WC_NETWORK_WINDOW, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_network_start_server_window_widgets, lengthof(_nested_network_start_server_window_widgets)
 );
 static void ShowNetworkStartServerWindow()
+{
 	DeleteWindowById(WC_NETWORK_WINDOW, WN_NETWORK_WINDOW_GAME);
@@ @@ -1610,13 +1610,13 @@ static const NWidgetPart _nested_network @@
 	EndContainer(),
 };
 static const WindowDesc _network_lobby_window_desc(
 	WDP_CENTER, 0, 0,
 	WC_NETWORK_WINDOW, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_network_lobby_window_widgets, lengthof(_nested_network_lobby_window_widgets)
 );
 /**
  * Show the networklobbywindow with the selected server.
  * @param ngl Selected game pointer which is passed to the new window.
@@ @@ -2231,13 +2231,13 @@ static const NWidgetPart _nested_network @@
 	EndContainer(),
 };
 static const WindowDesc _network_company_password_window_desc(
 	WDP_AUTO, 0, 0,
 	WC_COMPANY_PASSWORD_WINDOW, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_network_company_password_window_widgets, lengthof(_nested_network_company_password_window_widgets)
 );
 void ShowNetworkCompanyPasswordWindow(Window *parent)
+{
 	DeleteWindowById(WC_COMPANY_PASSWORD_WINDOW, 0);

src/newgrf_debug_gui.cpp

➞

Show inline comments

@@ @@ -518,13 +518,13 @@ static const NWidgetPart _nested_newgrf_ @@
 	EndContainer(),
 };
 static const WindowDesc _newgrf_inspect_desc(
 	WDP_AUTO, 400, 300,
 	WC_NEWGRF_INSPECT, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_newgrf_inspect_widgets, lengthof(_nested_newgrf_inspect_widgets)
 );
 /**
  * Show the inspect window for a given feature and index.
  * The index is normally an in-game location/identifier, such
@@ @@ -872,13 +872,13 @@ static const NWidgetPart _nested_sprite_ @@
 	EndContainer(),
 };
 static const WindowDesc _sprite_aligner_desc(
 	WDP_AUTO, 400, 300,
 	WC_SPRITE_ALIGNER, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_sprite_aligner_widgets, lengthof(_nested_sprite_aligner_widgets)
 );
 /**
  * Show the window for aligning sprites.
  */

src/newgrf_gui.cpp

➞

Show inline comments

@@ @@ -523,13 +523,13 @@ static const NWidgetPart _nested_newgrf_ @@
 };
 /** Window definition for the change grf parameters window */
 static const WindowDesc _newgrf_parameters_desc(
 	WDP_CENTER, 500, 208,
 	WC_GRF_PARAMETERS, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_newgrf_parameter_widgets, lengthof(_nested_newgrf_parameter_widgets)
 );
 static void OpenGRFParameterWindow(GRFConfig *c, bool editable)
+{
 	DeleteWindowByClass(WC_GRF_PARAMETERS);
@@ @@ -1881,13 +1881,13 @@ static const NWidgetPart _nested_newgrf_ @@
 };
 /* Window definition of the manage newgrfs window */
 static const WindowDesc _newgrf_desc(
 	WDP_CENTER, 300, 263,
 	WC_GAME_OPTIONS, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_newgrf_widgets, lengthof(_nested_newgrf_widgets)
 );
 /**
  * Callback function for the newgrf 'apply changes' confirmation window
  * @param w Window which is calling this callback
@@ @@ -1952,13 +1952,13 @@ static const NWidgetPart _nested_scan_pr @@
 };
 /** Description of the widgets and other settings of the window. */
 static const WindowDesc _scan_progress_desc(
 	WDP_CENTER, 0, 0,
 	WC_MODAL_PROGRESS, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_scan_progress_widgets, lengthof(_nested_scan_progress_widgets)
 );
 /** Window for showing the progress of NewGRF scanning. */
 struct ScanProgressWindow : public Window {
 	char *last_name; ///< The name of the last 'seen' NewGRF.

src/news_gui.cpp

➞

Show inline comments

@@ @@ -1074,13 +1074,13 @@ static const NWidgetPart _nested_message @@
 	EndContainer(),
 };
 static const WindowDesc _message_history_desc(
 	WDP_AUTO, 400, 140,
 	WC_MESSAGE_HISTORY, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_message_history, lengthof(_nested_message_history)
 );
 /** Display window with news messages history */
 void ShowMessageHistory()
+{
@@ @@ -1339,13 +1339,13 @@ static const NWidgetPart _nested_message @@
 	EndContainer(),
 };
 static const WindowDesc _message_options_desc(
 	WDP_AUTO, 0, 0,
 	WC_GAME_OPTIONS, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_message_options_widgets, lengthof(_nested_message_options_widgets)
 );
 /**
  * Show the settings window for news messages.
  */

src/order_gui.cpp

➞

Show inline comments

@@ @@ -1589,13 +1589,13 @@ static const NWidgetPart _nested_orders_ @@
 	EndContainer(),
 };
 static const WindowDesc _orders_train_desc(
 	WDP_AUTO, 384, 100,
 	WC_VEHICLE_ORDERS, WC_VEHICLE_VIEW,
-	WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION,
 	WDF_CONSTRUCTION,
 	_nested_orders_train_widgets, lengthof(_nested_orders_train_widgets)
 );
 /** Nested widget definition for "your" orders (non-train). */
 static const NWidgetPart _nested_orders_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
@@ @@ -1660,13 +1660,13 @@ static const NWidgetPart _nested_orders_ @@
 	EndContainer(),
 };
 static const WindowDesc _orders_desc(
 	WDP_AUTO, 384, 100,
 	WC_VEHICLE_ORDERS, WC_VEHICLE_VIEW,
-	WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION,
 	WDF_CONSTRUCTION,
 	_nested_orders_widgets, lengthof(_nested_orders_widgets)
 );
 /** Nested widget definition for competitor orders. */
 static const NWidgetPart _nested_other_orders_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
@@ @@ -1685,13 +1685,13 @@ static const NWidgetPart _nested_other_o @@
 	EndContainer(),
 };
 static const WindowDesc _other_orders_desc(
 	WDP_AUTO, 384, 86,
 	WC_VEHICLE_ORDERS, WC_VEHICLE_VIEW,
-	WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION,
 	WDF_CONSTRUCTION,
 	_nested_other_orders_widgets, lengthof(_nested_other_orders_widgets)
 );
 void ShowOrdersWindow(const Vehicle *v)
+{
 	DeleteWindowById(WC_VEHICLE_DETAILS, v->index, false);

src/osk_gui.cpp

➞

Show inline comments

@@ @@ -363,13 +363,13 @@ static const NWidgetPart _nested_osk_wid @@
 	EndContainer(),
 };
 static const WindowDesc _osk_desc(
 	WDP_CENTER, 0, 0,
 	WC_OSK, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_osk_widgets, lengthof(_nested_osk_widgets)
 );
 /**
  * Retrieve keyboard layout from language string or (if set) config file.
  * Also check for invalid characters.

src/rail_gui.cpp

➞

Show inline comments

@@ @@ -1614,13 +1614,13 @@ static const NWidgetPart _nested_signal_ @@
 };
 /** Signal selection window description */
 static const WindowDesc _signal_builder_desc(
 	WDP_AUTO, 0, 0,
 	WC_BUILD_SIGNAL, WC_BUILD_TOOLBAR,
-	WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION,
 	WDF_CONSTRUCTION,
 	_nested_signal_builder_widgets, lengthof(_nested_signal_builder_widgets)
 );
 /**
  * Open the signal selection window
  */

src/settings_gui.cpp

➞

Show inline comments

@@ @@ -668,13 +668,13 @@ static const NWidgetPart _nested_game_op @@
 	EndContainer(),
 };
 static const WindowDesc _game_options_desc(
 	WDP_CENTER, 0, 0,
 	WC_GAME_OPTIONS, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_game_options_widgets, lengthof(_nested_game_options_widgets)
 );
 /** Open the game options window. */
 void ShowGameOptions()
+{
@@ @@ -944,13 +944,13 @@ static const NWidgetPart _nested_game_di @@
 };
 /** Window definition for the game difficulty settings window */
 static const WindowDesc _game_difficulty_desc(
 	WDP_CENTER, 0, 0,
 	WC_GAME_OPTIONS, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_game_difficulty_widgets, lengthof(_nested_game_difficulty_widgets)
 );
 /** Open the game-difficulty window. */
 void ShowGameDifficulty()
+{
@@ @@ -2481,13 +2481,13 @@ static const NWidgetPart _nested_setting @@
 	EndContainer(),
 };
 static const WindowDesc _settings_selection_desc(
 	WDP_CENTER, 510, 450,
 	WC_GAME_OPTIONS, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_settings_selection_widgets, lengthof(_nested_settings_selection_widgets)
 );
 /** Open advanced settings window. */
 void ShowGameSettings()
+{
@@ @@ -2774,13 +2774,13 @@ static const NWidgetPart _nested_cust_cu @@
 	EndContainer(),
 };
 static const WindowDesc _cust_currency_desc(
 	WDP_CENTER, 0, 0,
 	WC_CUSTOM_CURRENCY, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_cust_currency_widgets, lengthof(_nested_cust_currency_widgets)
 );
 /** Open custom currency window. */
 static void ShowCustCurrency()
+{

src/signs_gui.cpp

➞

Show inline comments

@@ @@ -413,13 +413,13 @@ static const NWidgetPart _nested_sign_li @@
 	EndContainer(),
 };
 static const WindowDesc _sign_list_desc(
 	WDP_AUTO, 358, 138,
 	WC_SIGN_LIST, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_sign_list_widgets, lengthof(_nested_sign_list_widgets)
 );
 /**
  * Open the sign list window
+ *
@@ @@ -610,13 +610,13 @@ static const NWidgetPart _nested_query_s @@
 	EndContainer(),
 };
 static const WindowDesc _query_sign_edit_desc(
 	WDP_AUTO, 0, 0,
 	WC_QUERY_STRING, WC_NONE,
-	WDF_CONSTRUCTION | WDF_UNCLICK_BUTTONS,
 	WDF_CONSTRUCTION,
 	_nested_query_sign_edit_widgets, lengthof(_nested_query_sign_edit_widgets)
 );
 /**
  * Handle clicking on a sign.
  * @param si The sign that was clicked on.

src/smallmap_gui.cpp

➞

Show inline comments

@@ @@ -1744,13 +1744,13 @@ static const NWidgetPart _nested_smallma @@
 	EndContainer(),
 };
 static const WindowDesc _smallmap_desc(
 	WDP_AUTO, 446, 314,
 	WC_SMALLMAP, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_smallmap_widgets, lengthof(_nested_smallmap_widgets)
 );
 /**
  * Show the smallmap window.
  */

src/station_gui.cpp

➞

Show inline comments

@@ @@ -710,13 +710,13 @@ static const NWidgetPart _nested_company @@
 	EndContainer(),
 };
 static const WindowDesc _company_stations_desc(
 	WDP_AUTO, 358, 162,
 	WC_STATION_LIST, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_company_stations_widgets, lengthof(_nested_company_stations_widgets)
 );
 /**
  * Opens window with list of company's stations
+ *
@@ @@ -1170,13 +1170,13 @@ struct StationViewWindow : public Window @@
 };
 static const WindowDesc _station_view_desc(
 	WDP_AUTO, 249, 110,
 	WC_STATION_VIEW, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_station_view_widgets, lengthof(_nested_station_view_widgets)
 );
 /**
  * Opens StationViewWindow for given station
+ *

src/statusbar_gui.cpp

➞

Show inline comments

@@ @@ -235,13 +235,13 @@ static const NWidgetPart _nested_main_st @@
 	EndContainer(),
 };
 static WindowDesc _main_status_desc(
 	WDP_MANUAL, 640, 12,
 	WC_STATUS_BAR, WC_NONE,
-	WDF_UNCLICK_BUTTONS | WDF_NO_FOCUS,
 	WDF_NO_FOCUS,
 	_nested_main_status_widgets, lengthof(_nested_main_status_widgets)
 );
 /**
  * Checks whether the news ticker is currently being used.
  */

src/terraform_gui.cpp

➞

Show inline comments

@@ @@ -341,13 +341,13 @@ static const NWidgetPart _nested_terrafo @@
 	EndContainer(),
 };
 static const WindowDesc _terraform_desc(
 	WDP_MANUAL, 0, 0,
 	WC_SCEN_LAND_GEN, WC_NONE,
-	WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION,
 	WDF_CONSTRUCTION,
 	_nested_terraform_widgets, lengthof(_nested_terraform_widgets)
 );
 /**
  * Show the toolbar for terraforming in the game.
  * @param link The toolbar we might want to link to.

src/textfile_gui.cpp

➞

Show inline comments

@@ @@ -42,13 +42,13 @@ static const NWidgetPart _nested_textfil @@
 };
 /** Window definition for the textfile window */
 static const WindowDesc _textfile_desc(
 	WDP_CENTER, 630, 460,
 	WC_TEXTFILE, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_textfile_widgets, lengthof(_nested_textfile_widgets)
 );
 TextfileWindow::TextfileWindow(TextfileType file_type) : Window(), file_type(file_type)
+{
 	this->CreateNestedTree(&_textfile_desc);

src/timetable_gui.cpp

➞

Show inline comments

@@ @@ -689,13 +689,13 @@ static const NWidgetPart _nested_timetab @@
 	EndContainer(),
 };
 static const WindowDesc _timetable_desc(
 	WDP_AUTO, 400, 130,
 	WC_VEHICLE_TIMETABLE, WC_VEHICLE_VIEW,
-	WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION,
 	WDF_CONSTRUCTION,
 	_nested_timetable_widgets, lengthof(_nested_timetable_widgets)
 );
 /**
  * Show the timetable for a given vehicle.
  * @param v The vehicle to show the timetable for.

src/toolbar_gui.cpp

➞

Show inline comments

@@ @@ -2075,13 +2075,13 @@ static const NWidgetPart _nested_toolb_s @@
 	NWidgetFunction(MakeScenarioToolbar),
 };
 static WindowDesc _toolb_scen_desc(
 	WDP_MANUAL, 640, 22,
 	WC_MAIN_TOOLBAR, WC_NONE,
-	WDF_UNCLICK_BUTTONS | WDF_NO_FOCUS,
 	WDF_NO_FOCUS,
 	_nested_toolb_scen_widgets, lengthof(_nested_toolb_scen_widgets)
 );
 /** Allocate the toolbar. */
 void AllocateToolbar()
+{

src/town_gui.cpp

➞

Show inline comments

@@ @@ -279,13 +279,13 @@ public: @@
+	}
 };
 static const WindowDesc _town_authority_desc(
 	WDP_AUTO, 317, 222,
 	WC_TOWN_AUTHORITY, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_town_authority_widgets, lengthof(_nested_town_authority_widgets)
 );
 static void ShowTownAuthorityWindow(uint town)
+{
 	AllocateWindowDescFront<TownAuthorityWindow>(&_town_authority_desc, town);
@@ @@ -549,13 +549,13 @@ static const NWidgetPart _nested_town_ga @@
 	EndContainer(),
 };
 static const WindowDesc _town_game_view_desc(
 	WDP_AUTO, 260, TownViewWindow::WID_TV_HEIGHT_NORMAL,
 	WC_TOWN_VIEW, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_town_game_view_widgets, lengthof(_nested_town_game_view_widgets)
 );
 static const NWidgetPart _nested_town_editor_view_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_BROWN),
@@ @@ -580,13 +580,13 @@ static const NWidgetPart _nested_town_ed @@
 	EndContainer(),
 };
 static const WindowDesc _town_editor_view_desc(
 	WDP_AUTO, 260, TownViewWindow::WID_TV_HEIGHT_NORMAL,
 	WC_TOWN_VIEW, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_town_editor_view_widgets, lengthof(_nested_town_editor_view_widgets)
 );
 void ShowTownViewWindow(TownID town)
+{
 	if (_game_mode == GM_EDITOR) {
@@ @@ -885,13 +885,13 @@ GUITownList::SortFunction * const TownDi @@
 	&TownPopulationSorter,
 };
 static const WindowDesc _town_directory_desc(
 	WDP_AUTO, 208, 202,
 	WC_TOWN_DIRECTORY, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_town_directory_widgets, lengthof(_nested_town_directory_widgets)
 );
 void ShowTownDirectory()
+{
 	if (BringWindowToFrontById(WC_TOWN_DIRECTORY, 0)) return;
@@ @@ -1144,13 +1144,13 @@ public: @@
+	}
 };
 static const WindowDesc _found_town_desc(
 	WDP_AUTO, 160, 162,
 	WC_FOUND_TOWN, WC_NONE,
-	WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION,
 	WDF_CONSTRUCTION,
 	_nested_found_town_widgets, lengthof(_nested_found_town_widgets)
 );
 void ShowFoundTownWindow()
+{
 	if (_game_mode != GM_EDITOR && !Company::IsValidID(_local_company)) return;

src/tree_gui.cpp

➞

Show inline comments

@@ @@ -238,13 +238,13 @@ static const NWidgetPart _nested_build_t @@
 	EndContainer(),
 };
 static const WindowDesc _build_trees_desc(
 	WDP_AUTO, 0, 0,
 	WC_BUILD_TREES, WC_NONE,
-	WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION,
 	WDF_CONSTRUCTION,
 	_nested_build_trees_widgets, lengthof(_nested_build_trees_widgets)
 );
 void ShowBuildTreesToolbar()
+{
 	if (_game_mode != GM_EDITOR && !Company::IsValidID(_local_company)) return;

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -914,13 +914,13 @@ static const NWidgetPart _nested_vehicle @@
 	EndContainer(),
 };
 static const WindowDesc _vehicle_refit_desc(
 	WDP_AUTO, 240, 174,
 	WC_VEHICLE_REFIT, WC_VEHICLE_VIEW,
-	WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION,
 	WDF_CONSTRUCTION,
 	_nested_vehicle_refit_widgets, lengthof(_nested_vehicle_refit_widgets)
 );
 /**
  * Show the refit window for a vehicle
  * @param *v The vehicle to show the refit window for
@@ @@ -1611,13 +1611,13 @@ public: @@
+	}
 };
 static WindowDesc _vehicle_list_desc(
 	WDP_AUTO, 260, 246,
 	WC_INVALID, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_vehicle_list, lengthof(_nested_vehicle_list)
 );
 static void ShowVehicleListWindowLocal(CompanyID company, VehicleListType vlt, VehicleType vehicle_type, uint16 unique_number)
+{
 	if (!Company::IsValidID(company) && company != OWNER_NONE) return;
@@ @@ -2070,21 +2070,21 @@ struct VehicleDetailsWindow : Window { @@
 };
 /** Vehicle details window descriptor. */
 static const WindowDesc _train_vehicle_details_desc(
 	WDP_AUTO, 405, 178,
 	WC_VEHICLE_DETAILS, WC_VEHICLE_VIEW,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_train_vehicle_details_widgets, lengthof(_nested_train_vehicle_details_widgets)
 );
 /** Vehicle details window descriptor for other vehicles than a train. */
 static const WindowDesc _nontrain_vehicle_details_desc(
 	WDP_AUTO, 405, 113,
 	WC_VEHICLE_DETAILS, WC_VEHICLE_VIEW,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_nontrain_vehicle_details_widgets, lengthof(_nested_nontrain_vehicle_details_widgets)
 );
 /** Shows the vehicle details window of the given vehicle. */
 static void ShowVehicleDetailsWindow(const Vehicle *v)
+{
@@ @@ -2137,24 +2137,24 @@ static const NWidgetPart _nested_vehicle @@
 };
 /** Vehicle view window descriptor for all vehicles but trains. */
 static const WindowDesc _vehicle_view_desc(
 	WDP_AUTO, 250, 116,
 	WC_VEHICLE_VIEW, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_vehicle_view_widgets, lengthof(_nested_vehicle_view_widgets)
 );
 /**
  * Vehicle view window descriptor for trains. Only minimum_height and
  *  default_height are different for train view.
  */
 static const WindowDesc _train_view_desc(
 	WDP_AUTO, 250, 134,
 	WC_VEHICLE_VIEW, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_vehicle_view_widgets, lengthof(_nested_vehicle_view_widgets)
 );
 /* Just to make sure, nobody has changed the vehicle type constants, as we are
 	 using them for array indexing in a number of places here. */

src/viewport_gui.cpp

➞

Show inline comments

@@ @@ -153,13 +153,13 @@ public: @@
+	}
 };
 static const WindowDesc _extra_view_port_desc(
 	WDP_AUTO, 300, 268,
 	WC_EXTRA_VIEW_PORT, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_extra_view_port_widgets, lengthof(_nested_extra_view_port_widgets)
 );
 /**
  * Show a new Extra Viewport window.
  * @param tile Tile to center the view on. INVALID_TILE means to use the center of main viewport.

src/waypoint_gui.cpp

➞

Show inline comments

@@ @@ -170,13 +170,13 @@ static const NWidgetPart _nested_waypoin @@
 };
 /** The description of the waypoint view. */
 static const WindowDesc _waypoint_view_desc(
 	WDP_AUTO, 260, 118,
 	WC_WAYPOINT_VIEW, WC_NONE,
-	WDF_UNCLICK_BUTTONS,
+,
 	_nested_waypoint_view_widgets, lengthof(_nested_waypoint_view_widgets)
 );
 /**
  * Show the window for the given waypoint.
  * @param wp The waypoint to show the window for.

src/window.cpp

➞

Show inline comments

@@ @@ -1625,13 +1625,13 @@ static void DecreaseWindowCounters() @@
 	FOR_ALL_WINDOWS_FROM_FRONT(w) {
 		if ((w->flags & WF_TIMEOUT) && --w->timeout_timer == 0) {
 			CLRBITS(w->flags, WF_TIMEOUT);
 			w->OnTimeout();
-			if (w->desc_flags & WDF_UNCLICK_BUTTONS) w->RaiseButtons(true);
 			w->RaiseButtons(true);
+		}
+	}
+}
 static void HandlePlacePresize()
+{

src/window_gui.h

➞

Show inline comments

@@ @@ -182,15 +182,14 @@ struct WindowDesc : ZeroedMemoryAllocato @@
 /**
  * Window default widget/window handling flags
  */
 enum WindowDefaultFlag {
 	WDF_CONSTRUCTION    =   1 << 0, ///< This window is used for construction; close it whenever changing company.
 	WDF_UNCLICK_BUTTONS =   1 << 1, ///< Unclick buttons when the window event times out
 	WDF_MODAL           =   1 << 2, ///< The window is a modal child of some other window, meaning the parent is 'inactive'
 	WDF_NO_FOCUS        =   1 << 3, ///< This window won't get focus/make any other window lose focus when click
 	WDF_MODAL           =   1 << 1, ///< The window is a modal child of some other window, meaning the parent is 'inactive'
 	WDF_NO_FOCUS        =   1 << 2, ///< This window won't get focus/make any other window lose focus when click
 };
 /**
  * Data structure for resizing a window
  */
 struct ResizeInfo {

0 comments (0 inline, 0 general)