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

(svn r24731) -Codechange: Remove OnOpenOSKWindow and instead specify OK and CANCEL buttons via QueryString members.

Browse Source
This commit is contained in:
frosch
2012-11-13 21:46:54 +00:00
parent a1fd98291b
commit c6ac0299a8
7 changed files with 20 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/querystring_gui.h
View File

@@ -32,6 +32,8 @@ enum HandleEditBoxResult
*/
struct QueryString {
StringID caption;
int ok_button; ///< Widget button of parent window to simulate when pressing OK in OSK.
int cancel_button; ///< Widget button of parent window to simulate when pressing CANCEL in OSK.
Textbuf text;
const char *orig;
CharSetFilter afilter;
@@ -40,7 +42,7 @@ struct QueryString {
/**
* Make sure everything gets initialized properly.
*/
QueryString() : orig(NULL)
QueryString() : ok_button(-1), cancel_button(-1), orig(NULL)
{
}
@@ -78,12 +80,6 @@ struct QueryStringBaseWindow : public Window, public QueryString {
HandleEditBoxResult HandleEditBoxKey(int wid, uint16 key, uint16 keycode, EventState &state);
/**
* Callback for when the OSK window is opened.
* @param wid The widget the OSK is opened of.
*/
virtual void OnOpenOSKWindow(int wid);
/**
* Callback for when on input has been entered with the OSK.
* @param wid The widget the OSK was attached to.
@@ -91,7 +87,7 @@ struct QueryStringBaseWindow : public Window, public QueryString {
virtual void OnOSKInput(int wid) {}
};
void ShowOnScreenKeyboard(QueryStringBaseWindow *parent, int button, int cancel, int ok);
void ShowOnScreenKeyboard(QueryStringBaseWindow *parent, int button);
void UpdateOSKOriginalText(const QueryStringBaseWindow *parent, int button);
#endif /* QUERYSTRING_GUI_H */