(svn r13230) -Fix [FS#2030](r13171): When closing toolbars, also close their PickerWindows.

This commit is contained in:
frosch
2008-05-24 11:19:30 +00:00
parent 6884f9cb41
commit 8b1e7c8189
5 changed files with 51 additions and 48 deletions

View File

@@ -26,7 +26,7 @@
static byte _selected_airport_type;
static void ShowBuildAirportPicker();
static void ShowBuildAirportPicker(Window *parent);
void CcBuildAirport(bool success, TileIndex tile, uint32 p1, uint32 p2)
@@ -51,7 +51,7 @@ enum {
static void BuildAirClick_Airport(Window *w)
{
if (HandlePlacePushButton(w, ATW_AIRPORT, SPR_CURSOR_AIRPORT, VHM_RECT, PlaceAirport)) ShowBuildAirportPicker();
if (HandlePlacePushButton(w, ATW_AIRPORT, SPR_CURSOR_AIRPORT, VHM_RECT, PlaceAirport)) ShowBuildAirportPicker(w);
}
static void BuildAirClick_Demolish(Window *w)
@@ -172,7 +172,7 @@ class AirportPickerWindow : public PickerWindowBase {
public:
AirportPickerWindow(const WindowDesc *desc) : PickerWindowBase(desc)
AirportPickerWindow(const WindowDesc *desc, Window *parent) : PickerWindowBase(desc, parent)
{
this->SetWidgetLoweredState(BAW_BTN_DONTHILIGHT, !_station_show_coverage);
this->SetWidgetLoweredState(BAW_BTN_DOHILIGHT, _station_show_coverage);
@@ -298,9 +298,9 @@ static const WindowDesc _build_airport_desc = {
_build_airport_picker_widgets,
};
static void ShowBuildAirportPicker()
static void ShowBuildAirportPicker(Window *parent)
{
new AirportPickerWindow(&_build_airport_desc);
new AirportPickerWindow(&_build_airport_desc, parent);
}
void InitializeAirportGui()