dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove stub HandleOnEditText and now unused global variables.

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-03-01 21:20:15 +00:00
parent f820543391
commit 49e922daa6
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui.h
View File

@@ -22,7 +22,6 @@
struct Window; struct Window;
/* main_gui.cpp */ /* main_gui.cpp */
void HandleOnEditText(const char *str);
void InitializeGUI(); void InitializeGUI();
/* settings_gui.cpp */ /* settings_gui.cpp */

8
src/main_gui.cpp
View File

@@ -47,9 +47,6 @@
#include "safeguards.h" #include "safeguards.h"
static int _rename_id = 1;
static int _rename_what = -1;
void CcGiveMoney(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2) void CcGiveMoney(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
{ {
#ifdef ENABLE_NETWORK #ifdef ENABLE_NETWORK
@@ -68,11 +65,6 @@ void CcGiveMoney(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2
#endif /* ENABLE_NETWORK */ #endif /* ENABLE_NETWORK */
} }
void HandleOnEditText(const char *str)
{
NOT_REACHED();
}
/** /**
* This code is shared for the majority of the pushbuttons. * This code is shared for the majority of the pushbuttons.
* Handles e.g. the pressing of a button (to build things), playing of click sound and sets certain parameters * Handles e.g. the pressing of a button (to build things), playing of click sound and sets certain parameters

4
src/misc_gui.cpp
View File

@@ -945,6 +945,8 @@ struct QueryStringWindow : public Window
QueryStringWindow(StringID str, StringID caption, uint max_bytes, uint max_chars, WindowDesc *desc, Window *parent, CharSetFilter afilter, QueryStringFlags flags) : QueryStringWindow(StringID str, StringID caption, uint max_bytes, uint max_chars, WindowDesc *desc, Window *parent, CharSetFilter afilter, QueryStringFlags flags) :
Window(desc), editbox(max_bytes, max_chars) Window(desc), editbox(max_bytes, max_chars)
{ {
assert(parent != NULL);
char *last_of = &this->editbox.text.buf[this->editbox.text.max_bytes - 1]; char *last_of = &this->editbox.text.buf[this->editbox.text.max_bytes - 1];
GetString(this->editbox.text.buf, str, last_of); GetString(this->editbox.text.buf, str, last_of);
str_validate(this->editbox.text.buf, last_of, SVS_NONE); str_validate(this->editbox.text.buf, last_of, SVS_NONE);
@@ -996,7 +998,7 @@ struct QueryStringWindow : public Window
if (this->parent != NULL) { if (this->parent != NULL) {
this->parent->OnQueryTextFinished(this->editbox.text.buf); this->parent->OnQueryTextFinished(this->editbox.text.buf);
} else { } else {
HandleOnEditText(this->editbox.text.buf); NOT_REACHED();
} }
this->editbox.handled = true; this->editbox.handled = true;
} }