From 8b1e7c818945959b5d346812dc8dba4be52c343b Mon Sep 17 00:00:00 2001 From: frosch Date: Sat, 24 May 2008 11:19:30 +0000 Subject: (svn r13230) -Fix [FS#2030](r13171): When closing toolbars, also close their PickerWindows. --- src/dock_gui.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/dock_gui.cpp') diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp index 2e9c6117d..2c837f425 100644 --- a/src/dock_gui.cpp +++ b/src/dock_gui.cpp @@ -25,8 +25,8 @@ #include "table/sprites.h" #include "table/strings.h" -static void ShowBuildDockStationPicker(); -static void ShowBuildDocksDepotPicker(); +static void ShowBuildDockStationPicker(Window *parent); +static void ShowBuildDocksDepotPicker(Window *parent); static Axis _ship_depot_direction; @@ -105,13 +105,13 @@ static void BuildDocksClick_Demolish(Window *w) static void BuildDocksClick_Depot(Window *w) { if (!CanBuildVehicleInfrastructure(VEH_SHIP)) return; - if (HandlePlacePushButton(w, DTW_DEPOT, SPR_CURSOR_SHIP_DEPOT, VHM_RECT, PlaceDocks_Depot)) ShowBuildDocksDepotPicker(); + if (HandlePlacePushButton(w, DTW_DEPOT, SPR_CURSOR_SHIP_DEPOT, VHM_RECT, PlaceDocks_Depot)) ShowBuildDocksDepotPicker(w); } static void BuildDocksClick_Dock(Window *w) { if (!CanBuildVehicleInfrastructure(VEH_SHIP)) return; - if (HandlePlacePushButton(w, DTW_STATION, SPR_CURSOR_DOCK, VHM_SPECIAL, PlaceDocks_Dock)) ShowBuildDockStationPicker(); + if (HandlePlacePushButton(w, DTW_STATION, SPR_CURSOR_DOCK, VHM_SPECIAL, PlaceDocks_Dock)) ShowBuildDockStationPicker(w); } static void BuildDocksClick_Buoy(Window *w) @@ -255,7 +255,7 @@ private: }; public: - BuildDocksStationWindow(const WindowDesc *desc) : PickerWindowBase(desc) + BuildDocksStationWindow(const WindowDesc *desc, Window *parent) : PickerWindowBase(desc, parent) { this->LowerWidget(_station_show_coverage + BDSW_LT_OFF); this->FindWindowPlacementAndResize(desc); @@ -319,9 +319,9 @@ static const WindowDesc _build_dock_station_desc = { _build_dock_station_widgets, }; -static void ShowBuildDockStationPicker() +static void ShowBuildDockStationPicker(Window *parent) { - new BuildDocksStationWindow(&_build_dock_station_desc); + new BuildDocksStationWindow(&_build_dock_station_desc, parent); } struct BuildDocksDepotWindow : public PickerWindowBase { @@ -344,7 +344,7 @@ private: } public: - BuildDocksDepotWindow(const WindowDesc *desc) : PickerWindowBase(desc) + BuildDocksDepotWindow(const WindowDesc *desc, Window *parent) : PickerWindowBase(desc, parent) { this->LowerWidget(_ship_depot_direction + BDDW_X); UpdateDocksDirection(); @@ -394,9 +394,9 @@ static const WindowDesc _build_docks_depot_desc = { }; -static void ShowBuildDocksDepotPicker() +static void ShowBuildDocksDepotPicker(Window *parent) { - new BuildDocksDepotWindow(&_build_docks_depot_desc); + new BuildDocksDepotWindow(&_build_docks_depot_desc, parent); } -- cgit v1.2.3-54-g00ecf