mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r7176) -Fix: remove button was not always disabled when it should have been (rail/road build toolbar)
This commit is contained in:
parent
77bd3351e0
commit
a1a54976f5
|
@ -493,6 +493,8 @@ static void BuildRailToolbWndProc(Window *w, WindowEvent *e)
|
||||||
|
|
||||||
case WE_ABORT_PLACE_OBJ:
|
case WE_ABORT_PLACE_OBJ:
|
||||||
RaiseWindowButtons(w);
|
RaiseWindowButtons(w);
|
||||||
|
DisableWindowWidget(w, 16);
|
||||||
|
InvalidateWidget(w, 16);
|
||||||
|
|
||||||
w = FindWindowById(WC_BUILD_STATION, 0);
|
w = FindWindowById(WC_BUILD_STATION, 0);
|
||||||
if (w != NULL) WP(w,def_d).close = true;
|
if (w != NULL) WP(w,def_d).close = true;
|
||||||
|
|
|
@ -183,12 +183,11 @@ static OnButtonClick* const _build_road_button_proc[] = {
|
||||||
static void BuildRoadToolbWndProc(Window *w, WindowEvent *e)
|
static void BuildRoadToolbWndProc(Window *w, WindowEvent *e)
|
||||||
{
|
{
|
||||||
switch (e->event) {
|
switch (e->event) {
|
||||||
|
case WE_CREATE: DisableWindowWidget(w, 11); break;
|
||||||
|
|
||||||
case WE_PAINT:
|
case WE_PAINT:
|
||||||
if (IsWindowWidgetLowered(w, 3) || IsWindowWidgetLowered(w, 4)) {
|
if (IsWindowWidgetLowered(w, 3) || IsWindowWidgetLowered(w, 4)) {
|
||||||
EnableWindowWidget(w, 11);
|
EnableWindowWidget(w, 11);
|
||||||
} else {
|
|
||||||
DisableWindowWidget(w, 11);
|
|
||||||
RaiseWindowWidget(w, 11);
|
|
||||||
}
|
}
|
||||||
DrawWindowWidgets(w);
|
DrawWindowWidgets(w);
|
||||||
break;
|
break;
|
||||||
|
@ -222,6 +221,8 @@ static void BuildRoadToolbWndProc(Window *w, WindowEvent *e)
|
||||||
|
|
||||||
case WE_ABORT_PLACE_OBJ:
|
case WE_ABORT_PLACE_OBJ:
|
||||||
RaiseWindowButtons(w);
|
RaiseWindowButtons(w);
|
||||||
|
DisableWindowWidget(w, 11);
|
||||||
|
InvalidateWidget(w, 11);
|
||||||
|
|
||||||
w = FindWindowById(WC_BUS_STATION, 0);
|
w = FindWindowById(WC_BUS_STATION, 0);
|
||||||
if (w != NULL) WP(w,def_d).close = true;
|
if (w != NULL) WP(w,def_d).close = true;
|
||||||
|
|
Loading…
Reference in New Issue