mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r11596) -Codechange: Use the Window member HandleButtonClick and remove its now useless counterpart function

release/0.6
belugas 2007-12-08 03:10:50 +00:00
parent b23f824f18
commit 73c58d8a40
8 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/depot_gui.cpp
View File

@ -916,7 +916,7 @@ static void DepotWndProc(Window *w, WindowEvent *e)
if (w->IsWidgetDisabled(e->we.click.widget)) return; if (w->IsWidgetDisabled(e->we.click.widget)) return;
if (WP(w, depot_d).sel == INVALID_VEHICLE) return; if (WP(w, depot_d).sel == INVALID_VEHICLE) return;
HandleButtonClick(w, e->we.click.widget); w->HandleButtonClick(e->we.click.widget);
v = GetVehicle(WP(w, depot_d).sel); v = GetVehicle(WP(w, depot_d).sel);
WP(w, depot_d).sel = INVALID_VEHICLE; WP(w, depot_d).sel = INVALID_VEHICLE;

8
src/genworld_gui.cpp
View File

@ -384,7 +384,7 @@ static void GenerateLandscapeWndProc(Window *w, WindowEvent *e)
case GLAND_START_DATE_DOWN: case GLAND_START_DATE_UP: // Year buttons case GLAND_START_DATE_DOWN: case GLAND_START_DATE_UP: // Year buttons
/* Don't allow too fast scrolling */ /* Don't allow too fast scrolling */
if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) { if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
HandleButtonClick(w, e->we.click.widget); w->HandleButtonClick(e->we.click.widget);
SetWindowDirty(w); SetWindowDirty(w);
_patches_newgame.starting_year = Clamp(_patches_newgame.starting_year + e->we.click.widget - GLAND_START_DATE_TEXT, MIN_YEAR, MAX_YEAR); _patches_newgame.starting_year = Clamp(_patches_newgame.starting_year + e->we.click.widget - GLAND_START_DATE_TEXT, MIN_YEAR, MAX_YEAR);
@ -399,7 +399,7 @@ static void GenerateLandscapeWndProc(Window *w, WindowEvent *e)
case GLAND_SNOW_LEVEL_DOWN: case GLAND_SNOW_LEVEL_UP: // Snow line buttons case GLAND_SNOW_LEVEL_DOWN: case GLAND_SNOW_LEVEL_UP: // Snow line buttons
/* Don't allow too fast scrolling */ /* Don't allow too fast scrolling */
if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) { if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
HandleButtonClick(w, e->we.click.widget); w->HandleButtonClick(e->we.click.widget);
SetWindowDirty(w); SetWindowDirty(w);
_patches_newgame.snow_line_height = Clamp(_patches_newgame.snow_line_height + e->we.click.widget - GLAND_SNOW_LEVEL_TEXT, 2, MAX_SNOWLINE_HEIGHT); _patches_newgame.snow_line_height = Clamp(_patches_newgame.snow_line_height + e->we.click.widget - GLAND_SNOW_LEVEL_TEXT, 2, MAX_SNOWLINE_HEIGHT);
@ -654,7 +654,7 @@ static void CreateScenarioWndProc(Window *w, WindowEvent *e)
case CSCEN_START_DATE_DOWN: case CSCEN_START_DATE_UP: // Year buttons case CSCEN_START_DATE_DOWN: case CSCEN_START_DATE_UP: // Year buttons
/* Don't allow too fast scrolling */ /* Don't allow too fast scrolling */
if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) { if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
HandleButtonClick(w, e->we.click.widget); w->HandleButtonClick(e->we.click.widget);
SetWindowDirty(w); SetWindowDirty(w);
_patches_newgame.starting_year = Clamp(_patches_newgame.starting_year + e->we.click.widget - CSCEN_START_DATE_TEXT, MIN_YEAR, MAX_YEAR); _patches_newgame.starting_year = Clamp(_patches_newgame.starting_year + e->we.click.widget - CSCEN_START_DATE_TEXT, MIN_YEAR, MAX_YEAR);
@ -669,7 +669,7 @@ static void CreateScenarioWndProc(Window *w, WindowEvent *e)
case CSCEN_FLAT_LAND_HEIGHT_DOWN: case CSCEN_FLAT_LAND_HEIGHT_UP: // Height level buttons case CSCEN_FLAT_LAND_HEIGHT_DOWN: case CSCEN_FLAT_LAND_HEIGHT_UP: // Height level buttons
/* Don't allow too fast scrolling */ /* Don't allow too fast scrolling */
if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) { if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
HandleButtonClick(w, e->we.click.widget); w->HandleButtonClick(e->we.click.widget);
SetWindowDirty(w); SetWindowDirty(w);
_patches_newgame.se_flat_world_height = Clamp(_patches_newgame.se_flat_world_height + e->we.click.widget - CSCEN_FLAT_LAND_HEIGHT_TEXT, 0, MAX_TILE_HEIGHT); _patches_newgame.se_flat_world_height = Clamp(_patches_newgame.se_flat_world_height + e->we.click.widget - CSCEN_FLAT_LAND_HEIGHT_TEXT, 0, MAX_TILE_HEIGHT);

4
src/industry_gui.cpp
View File

@ -256,7 +256,7 @@ static void BuildDynamicIndustryWndProc(Window *w, WindowEvent *e)
case DYNA_INDU_FUND_WIDGET: { case DYNA_INDU_FUND_WIDGET: {
if (WP(w, fnd_d).select == INVALID_INDUSTRYTYPE) { if (WP(w, fnd_d).select == INVALID_INDUSTRYTYPE) {
HandleButtonClick(w, DYNA_INDU_FUND_WIDGET); w->HandleButtonClick(DYNA_INDU_FUND_WIDGET);
if (GetNumTowns() == 0) { if (GetNumTowns() == 0) {
ShowErrorMessage(STR_0286_MUST_BUILD_TOWN_FIRST, STR_CAN_T_GENERATE_INDUSTRIES, 0, 0); ShowErrorMessage(STR_0286_MUST_BUILD_TOWN_FIRST, STR_CAN_T_GENERATE_INDUSTRIES, 0, 0);
@ -268,7 +268,7 @@ static void BuildDynamicIndustryWndProc(Window *w, WindowEvent *e)
} }
} else if (_game_mode != GM_EDITOR && _patches.raw_industry_construction == 2 && GetIndustrySpec(WP(w, fnd_d).select)->IsRawIndustry()) { } else if (_game_mode != GM_EDITOR && _patches.raw_industry_construction == 2 && GetIndustrySpec(WP(w, fnd_d).select)->IsRawIndustry()) {
DoCommandP(0, WP(w, fnd_d).select, 0, NULL, CMD_BUILD_INDUSTRY | CMD_MSG(STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY)); DoCommandP(0, WP(w, fnd_d).select, 0, NULL, CMD_BUILD_INDUSTRY | CMD_MSG(STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY));
HandleButtonClick(w, DYNA_INDU_FUND_WIDGET); w->HandleButtonClick(DYNA_INDU_FUND_WIDGET);
} else { } else {
HandlePlacePushButton(w, DYNA_INDU_FUND_WIDGET, SPR_CURSOR_INDUSTRY, VHM_RECT, NULL); HandlePlacePushButton(w, DYNA_INDU_FUND_WIDGET, SPR_CURSOR_INDUSTRY, VHM_RECT, NULL);
} }

32
src/main_gui.cpp
View File

@ -907,7 +907,7 @@ bool DoZoomInOutWindow(int how, Window *w)
static void ToolbarZoomInClick(Window *w) static void ToolbarZoomInClick(Window *w)
{ {
if (DoZoomInOutWindow(ZOOM_IN, FindWindowById(WC_MAIN_WINDOW, 0))) { if (DoZoomInOutWindow(ZOOM_IN, FindWindowById(WC_MAIN_WINDOW, 0))) {
HandleButtonClick(w, 17); w->HandleButtonClick(17);
SndPlayFx(SND_15_BEEP); SndPlayFx(SND_15_BEEP);
} }
} }
@ -915,7 +915,7 @@ static void ToolbarZoomInClick(Window *w)
static void ToolbarZoomOutClick(Window *w) static void ToolbarZoomOutClick(Window *w)
{ {
if (DoZoomInOutWindow(ZOOM_OUT,FindWindowById(WC_MAIN_WINDOW, 0))) { if (DoZoomInOutWindow(ZOOM_OUT,FindWindowById(WC_MAIN_WINDOW, 0))) {
HandleButtonClick(w, 18); w->HandleButtonClick(18);
SndPlayFx(SND_15_BEEP); SndPlayFx(SND_15_BEEP);
} }
} }
@ -992,7 +992,7 @@ static void ToolbarScenDateBackward(Window *w)
{ {
/* don't allow too fast scrolling */ /* don't allow too fast scrolling */
if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) { if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
HandleButtonClick(w, 6); w->HandleButtonClick(6);
SetWindowDirty(w); SetWindowDirty(w);
_patches_newgame.starting_year = Clamp(_patches_newgame.starting_year - 1, MIN_YEAR, MAX_YEAR); _patches_newgame.starting_year = Clamp(_patches_newgame.starting_year - 1, MIN_YEAR, MAX_YEAR);
@ -1005,7 +1005,7 @@ static void ToolbarScenDateForward(Window *w)
{ {
/* don't allow too fast scrolling */ /* don't allow too fast scrolling */
if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) { if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
HandleButtonClick(w, 7); w->HandleButtonClick(7);
SetWindowDirty(w); SetWindowDirty(w);
_patches_newgame.starting_year = Clamp(_patches_newgame.starting_year + 1, MIN_YEAR, MAX_YEAR); _patches_newgame.starting_year = Clamp(_patches_newgame.starting_year + 1, MIN_YEAR, MAX_YEAR);
@ -1023,7 +1023,7 @@ static void ToolbarScenMapTownDir(Window *w)
static void ToolbarScenZoomIn(Window *w) static void ToolbarScenZoomIn(Window *w)
{ {
if (DoZoomInOutWindow(ZOOM_IN, FindWindowById(WC_MAIN_WINDOW, 0))) { if (DoZoomInOutWindow(ZOOM_IN, FindWindowById(WC_MAIN_WINDOW, 0))) {
HandleButtonClick(w, 9); w->HandleButtonClick(9);
SndPlayFx(SND_15_BEEP); SndPlayFx(SND_15_BEEP);
} }
} }
@ -1031,7 +1031,7 @@ static void ToolbarScenZoomIn(Window *w)
static void ToolbarScenZoomOut(Window *w) static void ToolbarScenZoomOut(Window *w)
{ {
if (DoZoomInOutWindow(ZOOM_OUT, FindWindowById(WC_MAIN_WINDOW, 0))) { if (DoZoomInOutWindow(ZOOM_OUT, FindWindowById(WC_MAIN_WINDOW, 0))) {
HandleButtonClick(w, 10); w->HandleButtonClick(10);
SndPlayFx(SND_15_BEEP); SndPlayFx(SND_15_BEEP);
} }
} }
@ -1333,7 +1333,7 @@ static void ScenEditLandGenWndProc(Window *w, WindowEvent *e)
break; break;
case 12: case 13: { // Increase/Decrease terraform size case 12: case 13: { // Increase/Decrease terraform size
int size = (e->we.click.widget == 12) ? 1 : -1; int size = (e->we.click.widget == 12) ? 1 : -1;
HandleButtonClick(w, e->we.click.widget); w->HandleButtonClick(e->we.click.widget);
size += _terraform_size; size += _terraform_size;
if (!IsInsideMM(size, 1, 8 + 1)) return; if (!IsInsideMM(size, 1, 8 + 1)) return;
@ -1343,7 +1343,7 @@ static void ScenEditLandGenWndProc(Window *w, WindowEvent *e)
SetWindowDirty(w); SetWindowDirty(w);
} break; } break;
case 14: // gen random land case 14: // gen random land
HandleButtonClick(w, 14); w->HandleButtonClick(14);
ShowCreateScenario(); ShowCreateScenario();
break; break;
case 15: // Reset landscape case 15: // Reset landscape
@ -1410,7 +1410,7 @@ static inline void ShowEditorTerraformToolBar()
static void ToolbarScenGenLand(Window *w) static void ToolbarScenGenLand(Window *w)
{ {
HandleButtonClick(w, 11); w->HandleButtonClick(11);
SndPlayFx(SND_15_BEEP); SndPlayFx(SND_15_BEEP);
ShowEditorTerraformToolBar(); ShowEditorTerraformToolBar();
@ -1469,7 +1469,7 @@ static void ScenEditTownGenWndProc(Window *w, WindowEvent *e)
uint size = min(_scengen_town_size, (int)TSM_CITY); uint size = min(_scengen_town_size, (int)TSM_CITY);
TownSizeMode mode = _scengen_town_size > TSM_CITY ? TSM_CITY : TSM_FIXED; TownSizeMode mode = _scengen_town_size > TSM_CITY ? TSM_CITY : TSM_FIXED;
HandleButtonClick(w, 5); w->HandleButtonClick(5);
_generating_world = true; _generating_world = true;
t = CreateRandomTown(20, mode, size); t = CreateRandomTown(20, mode, size);
_generating_world = false; _generating_world = false;
@ -1483,7 +1483,7 @@ static void ScenEditTownGenWndProc(Window *w, WindowEvent *e)
break; break;
} }
case 6: {// many random towns case 6: {// many random towns
HandleButtonClick(w, 6); w->HandleButtonClick(6);
_generating_world = true; _generating_world = true;
if (!GenerateTowns()) ShowErrorMessage(STR_NO_SPACE_FOR_TOWN, STR_CANNOT_GENERATE_TOWN, 0, 0); if (!GenerateTowns()) ShowErrorMessage(STR_NO_SPACE_FOR_TOWN, STR_CANNOT_GENERATE_TOWN, 0, 0);
@ -1526,7 +1526,7 @@ static const WindowDesc _scen_edit_town_gen_desc = {
static void ToolbarScenGenTown(Window *w) static void ToolbarScenGenTown(Window *w)
{ {
HandleButtonClick(w, 12); w->HandleButtonClick(12);
SndPlayFx(SND_15_BEEP); SndPlayFx(SND_15_BEEP);
AllocateWindowDescFront(&_scen_edit_town_gen_desc, 0); AllocateWindowDescFront(&_scen_edit_town_gen_desc, 0);
@ -1534,28 +1534,28 @@ static void ToolbarScenGenTown(Window *w)
static void ToolbarScenGenIndustry(Window *w) static void ToolbarScenGenIndustry(Window *w)
{ {
HandleButtonClick(w, 13); w->HandleButtonClick(13);
SndPlayFx(SND_15_BEEP); SndPlayFx(SND_15_BEEP);
ShowBuildIndustryWindow(); ShowBuildIndustryWindow();
} }
static void ToolbarScenBuildRoad(Window *w) static void ToolbarScenBuildRoad(Window *w)
{ {
HandleButtonClick(w, 14); w->HandleButtonClick(14);
SndPlayFx(SND_15_BEEP); SndPlayFx(SND_15_BEEP);
ShowBuildRoadScenToolbar(); ShowBuildRoadScenToolbar();
} }
static void ToolbarScenPlantTrees(Window *w) static void ToolbarScenPlantTrees(Window *w)
{ {
HandleButtonClick(w, 15); w->HandleButtonClick(15);
SndPlayFx(SND_15_BEEP); SndPlayFx(SND_15_BEEP);
ShowBuildTreesScenToolbar(); ShowBuildTreesScenToolbar();
} }
static void ToolbarScenPlaceSign(Window *w) static void ToolbarScenPlaceSign(Window *w)
{ {
HandleButtonClick(w, 16); w->HandleButtonClick(16);
SndPlayFx(SND_15_BEEP); SndPlayFx(SND_15_BEEP);
SelectSignTool(); SelectSignTool();
} }

2
src/misc_gui.cpp
View File

@ -1591,7 +1591,7 @@ static void SaveLoadDlgWndProc(Window *w, WindowEvent *e)
if (_saveload_mode == SLD_SAVE_GAME || _saveload_mode == SLD_SAVE_SCENARIO) { if (_saveload_mode == SLD_SAVE_GAME || _saveload_mode == SLD_SAVE_SCENARIO) {
if (HandleEditBoxKey(w, &WP(w, querystr_d), 10, e) == 1) // Press Enter if (HandleEditBoxKey(w, &WP(w, querystr_d), 10, e) == 1) // Press Enter
HandleButtonClick(w, 12); w->HandleButtonClick(12);
} }
break; break;
case WE_TIMEOUT: case WE_TIMEOUT:

2
src/network/network_gui.cpp
View File

@ -755,7 +755,7 @@ static void NetworkStartServerWindowWndProc(Window *w, WindowEvent *e)
case NSSW_SPECTATORS_BTND: case NSSW_SPECTATORS_BTNU: // Click on up/down button for number of spectators case NSSW_SPECTATORS_BTND: case NSSW_SPECTATORS_BTNU: // Click on up/down button for number of spectators
/* Don't allow too fast scrolling */ /* Don't allow too fast scrolling */
if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) { if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
HandleButtonClick(w, e->we.click.widget); w->HandleButtonClick(e->we.click.widget);
SetWindowDirty(w); SetWindowDirty(w);
switch (e->we.click.widget) { switch (e->we.click.widget) {
default: NOT_REACHED(); default: NOT_REACHED();

10
src/window.cpp
View File

@ -97,14 +97,6 @@ void Window::HandleButtonClick(byte widget)
this->InvalidateWidget(widget); this->InvalidateWidget(widget);
} }
void HandleButtonClick(Window *w, byte widget)
{
w->LowerWidget(widget);
w->flags4 |= 5 << WF_TIMEOUT_SHL;
w->InvalidateWidget(widget);
}
static void StartWindowDrag(Window *w); static void StartWindowDrag(Window *w);
static void StartWindowSizing(Window *w); static void StartWindowSizing(Window *w);
@ -132,7 +124,7 @@ static void DispatchLeftClickEvent(Window *w, int x, int y, bool double_click)
case WWT_PANEL | WWB_PUSHBUTTON: /* WWT_PUSHBTN */ case WWT_PANEL | WWB_PUSHBUTTON: /* WWT_PUSHBTN */
case WWT_IMGBTN | WWB_PUSHBUTTON: /* WWT_PUSHIMGBTN */ case WWT_IMGBTN | WWB_PUSHBUTTON: /* WWT_PUSHIMGBTN */
case WWT_TEXTBTN | WWB_PUSHBUTTON: /* WWT_PUSHTXTBTN */ case WWT_TEXTBTN | WWB_PUSHBUTTON: /* WWT_PUSHTXTBTN */
HandleButtonClick(w, e.we.click.widget); w->HandleButtonClick(e.we.click.widget);
break; break;
} }
} else if (wi->type == WWT_SCROLLBAR || wi->type == WWT_SCROLL2BAR || wi->type == WWT_HSCROLLBAR) { } else if (wi->type == WWT_SCROLLBAR || wi->type == WWT_SCROLL2BAR || wi->type == WWT_HSCROLLBAR) {

1
src/window.h
View File

@ -646,7 +646,6 @@ int GetWidgetFromPos(const Window *w, int x, int y);
void DrawWindowWidgets(const Window *w); void DrawWindowWidgets(const Window *w);
void ShowDropDownMenu(Window *w, const StringID *strings, int selected, int button, uint32 disabled_mask, uint32 hidden_mask); void ShowDropDownMenu(Window *w, const StringID *strings, int selected, int button, uint32 disabled_mask, uint32 hidden_mask);
void HandleButtonClick(Window *w, byte widget);
Window *GetCallbackWnd(); Window *GetCallbackWnd();
void DeleteNonVitalWindows(); void DeleteNonVitalWindows();